Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-04-03 Merge branch 'patch/6-7-2' into '6-7-stable'Marin Jankovski
6.7.3 patch release
2014-04-03Do not require modernizr.Marin Jankovski
Conflicts: app/assets/javascripts/main.js.coffee
2014-04-02Use current_user for Notification#merge_mrDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-01Fix the merge notification email not being sentPierre de La Morinerie
The 'author_id_of_changes' attribute is not persisted in the database. As we retrieve the merge request from the DB just before sending the email, this attribute was always nil. Also there was no tests for the merge notification code - tests have been added. Fix #6605
2014-03-21Merge branch 'username-keys-content-type' of ↵Dmitriy Zaporozhets
https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
2014-03-20Fix `/:username.keys` response content typeDmitry Medvinsky
Currently this method responds with `text/html`. It is kind of unusable if you open it in a browser. The browser thinks it is HTML and renders it as HTML, meaning new lines are dropped. So it's very hard to distinguish where the key starts and where it ends. This commit changes the content type header to `text/plain`.
2014-03-20New bindings to vote on notes.Marin Jankovski
2014-03-20Use new gems methods.Marin Jankovski
2014-03-20 Merge branch 'oauth-require-public-email' into 'master'Dmitriy Zaporozhets
Oauth Require Public Email Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.
2014-03-19Merge pull request #6469 from mojavelinux/masterSytse Sijbrandij
Add .adoc file extension for AsciiDoc
2014-03-19Merge pull request #6457 from lol768/patch-1Sytse Sijbrandij
Fix registration error info typo
2014-03-19line breakJob van der Voort
2014-03-19require public email with oauth provider messageJob van der Voort
2014-03-19Add room placeholder for Slack integrationDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19Replace turbolink spinner with nprogressDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2014-03-18Added Slack service integration.Federico Ravasio
2014-03-18Do not allow password reset for ldap user.Marin Jankovski
2014-03-17 Merge branch 'links_within_same_repo' into 'master'Dmitriy Zaporozhets
Relative links within one system When using relative links in md in repository file it will only link within the repository. When using relative links in md in wiki page, it will only link to wiki pages.
2014-03-17Default value for Snippet#privateDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17Wiki will show relative links related to the wiki gollum repository.Marin Jankovski
2014-03-17Link to blob instead of linking to wiki.Marin Jankovski
2014-03-17Show link to public projects for new users.Ciro Santillli
2014-03-15 Merge branch 'improve-project-lookup' into 'master'Dmitriy Zaporozhets
Improve Project Lookup Fixes #1080
2014-03-15 Merge branch 'snippets-page' into 'master'Dmitriy Zaporozhets
Render 404 instead of 500 if trying to see snippets of unexisting user Fixes #1087
2014-03-15Fix commit comment count cssDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14Project must have namespace for Project#find_with_namespaceDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14Render 404 instead of 500 if trying to see snippets of unexisting userDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14Remove confusing codeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14Fix global searchDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14Ignore newlines per md standard.Marin Jankovski
2014-03-14Fix mr process order on push.Dmitriy Zaporozhets
First close merge requests that being merged. Then update code of open mr. This fixes bug when MR merged via command line lose their diff because code reload was before MR close. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14Merge branch 'ldap_connections'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
2014-03-14Merge branch 'import-timeout' of ↵Dmitriy Zaporozhets
https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG db/schema.rb
2014-03-14Open/close LDAP in ApplicationControllerJacob Vosmaer
By opening the LDAP connection at the controller level we can reuse it for all LDAP queries during the request.
2014-03-14Correct BackgroundJobs page for both OSX and linuxDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14Merge branch 'toggle_diff_comments' of ↵Dmitriy Zaporozhets
https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/assets/stylesheets/sections/commits.scss app/assets/stylesheets/sections/notes.scss app/views/projects/commits/_diffs.html.haml features/steps/project/merge_requests.rb
2014-03-13Remove default value for Project#importedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-13Create event and clear cache on new trag pushDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-13Fix BackgroundJobs pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-13Hide retry import form for non mastersDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-13Redirect to import page from show when import in progressDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Add retry feature to project importDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Project import and retry import scaffoldDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Add project import state machineDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Move project creation to serviceDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Improve import noticeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Move images from vendor to app so they are compiled by railsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Correct image path to social iconsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12Merge pull request #6474 from jvanbaarsen/post-tag-hookDmitriy Zaporozhets
Add web hooks on tag
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:48:43 +0300