summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'username-keys-content-type' of ↵Dmitriy Zaporozhets2014-03-211-1/+1
|\ | | | | | | | | | | | | | | | | https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * Fix `/:username.keys` response content typeDmitry Medvinsky2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | 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`.
* | New bindings to vote on notes.Marin Jankovski2014-03-201-2/+4
| |
* | Use new gems methods.Marin Jankovski2014-03-202-2/+2
|/
* Merge branch 'oauth-require-public-email' into 'master'Dmitriy Zaporozhets2014-03-201-1/+3
|\ | | | | | | | | | | Oauth Require Public Email Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.
| * line breakJob van der Voort2014-03-191-0/+1
| |
| * require public email with oauth provider messageJob van der Voort2014-03-191-1/+2
| |
* | Merge pull request #6469 from mojavelinux/masterSytse Sijbrandij2014-03-191-1/+1
|\ \ | | | | | | Add .adoc file extension for AsciiDoc
| * | Add .adoc file extension for AsciiDocDan Allen2014-03-041-1/+1
| | | | | | | | | Add .adoc file extension for AsciiDoc as it's a very popular extension to use and the one recommended by the Asciidoctor project.
* | | Merge pull request #6457 from lol768/patch-1Sytse Sijbrandij2014-03-191-1/+1
|\ \ \ | |_|/ |/| | Fix registration error info typo
| * | Fix registration error info typolol7682014-03-021-1/+1
| | |
* | | Add room placeholder for Slack integrationDmitriy Zaporozhets2014-03-191-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Replace turbolink spinner with nprogressDmitriy Zaporozhets2014-03-194-12/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-193-1/+164
|\ \ \
| * | | Added Slack service integration.Federico Ravasio2014-03-183-1/+164
| | | |
* | | | Do not allow password reset for ldap user.Marin Jankovski2014-03-181-0/+18
|/ / /
* | | Merge branch 'links_within_same_repo' into 'master'Dmitriy Zaporozhets2014-03-171-4/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Wiki will show relative links related to the wiki gollum repository.Marin Jankovski2014-03-171-2/+1
| | | |
| * | | Link to blob instead of linking to wiki.Marin Jankovski2014-03-171-2/+2
| | | |
* | | | Default value for Snippet#privateDmitriy Zaporozhets2014-03-171-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Show link to public projects for new users.Ciro Santillli2014-03-172-0/+17
|/ / /
* | | Merge branch 'improve-project-lookup' into 'master'Dmitriy Zaporozhets2014-03-151-9/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | Improve Project Lookup Fixes #1080
| * | | Project must have namespace for Project#find_with_namespaceDmitriy Zaporozhets2014-03-141-9/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'snippets-page' into 'master'Dmitriy Zaporozhets2014-03-141-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Render 404 instead of 500 if trying to see snippets of unexisting user Fixes #1087
| * | | | Render 404 instead of 500 if trying to see snippets of unexisting userDmitriy Zaporozhets2014-03-141-0/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix commit comment count cssDmitriy Zaporozhets2014-03-141-1/+1
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Remove confusing codeDmitriy Zaporozhets2014-03-141-3/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix global searchDmitriy Zaporozhets2014-03-142-1/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Ignore newlines per md standard.Marin Jankovski2014-03-141-2/+1
| | |
* | | Fix mr process order on push.Dmitriy Zaporozhets2014-03-141-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'ldap_connections'Dmitriy Zaporozhets2014-03-141-9/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | Open/close LDAP in ApplicationControllerJacob Vosmaer2014-03-141-9/+11
| | | | | | | | | | | | | | | | | | | | By opening the LDAP connection at the controller level we can reuse it for all LDAP queries during the request.
* | | | Merge branch 'import-timeout' of ↵Dmitriy Zaporozhets2014-03-149-96/+167
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Remove default value for Project#importedDmitriy Zaporozhets2014-03-131-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Hide retry import form for non mastersDmitriy Zaporozhets2014-03-131-12/+13
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Redirect to import page from show when import in progressDmitriy Zaporozhets2014-03-131-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add retry feature to project importDmitriy Zaporozhets2014-03-123-6/+26
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Project import and retry import scaffoldDmitriy Zaporozhets2014-03-124-55/+89
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add project import state machineDmitriy Zaporozhets2014-03-122-12/+22
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Move project creation to serviceDmitriy Zaporozhets2014-03-122-25/+24
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Improve import noticeDmitriy Zaporozhets2014-03-121-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Show import notice in callout blockDmitriy Zaporozhets2014-03-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Better explanation for import urlDmitriy Zaporozhets2014-03-111-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Correct BackgroundJobs page for both OSX and linuxDmitriy Zaporozhets2014-03-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'toggle_diff_comments' of ↵Dmitriy Zaporozhets2014-03-134-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add button for toggling inline comments in diff view.Jacob Carlborg2014-02-225-4/+42
| | | | | | | | | | | | | | | | | | | | This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
* | | | | Create event and clear cache on new trag pushDmitriy Zaporozhets2014-03-131-0/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix BackgroundJobs pageDmitriy Zaporozhets2014-03-131-12/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Move images from vendor to app so they are compiled by railsDmitriy Zaporozhets2014-03-1212-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Correct image path to social iconsDmitriy Zaporozhets2014-03-121-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status