summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch/6-7-2' into '6-7-stable'Marin Jankovski2014-04-034-6/+6
|\
| * Use current_user for Notification#merge_mrDmitriy Zaporozhets2014-04-023-4/+4
| * Fix the merge notification email not being sentPierre de La Morinerie2014-04-012-3/+3
* | Do not require modernizr.Marin Jankovski2014-04-031-1/+0
|/
* Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gi...Dmitriy Zaporozhets2014-03-211-1/+1
|\
| * Fix `/:username.keys` response content typeDmitry Medvinsky2014-03-201-1/+1
* | 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
|\
| * 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 AsciiDocDan Allen2014-03-041-1/+1
* | | Merge pull request #6457 from lol768/patch-1Sytse Sijbrandij2014-03-191-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix registration error info typolol7682014-03-021-1/+1
* | | Add room placeholder for Slack integrationDmitriy Zaporozhets2014-03-191-1/+1
* | | Replace turbolink spinner with nprogressDmitriy Zaporozhets2014-03-194-12/+4
* | | 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
|\ \ \
| * | | 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
* | | | 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
|\ \ \
| * | | Project must have namespace for Project#find_with_namespaceDmitriy Zaporozhets2014-03-141-9/+7
* | | | Merge branch 'snippets-page' into 'master'Dmitriy Zaporozhets2014-03-141-0/+3
|\ \ \ \
| * | | | Render 404 instead of 500 if trying to see snippets of unexisting userDmitriy Zaporozhets2014-03-141-0/+3
| |/ / /
* | | | Fix commit comment count cssDmitriy Zaporozhets2014-03-141-1/+1
|/ / /
* | | Remove confusing codeDmitriy Zaporozhets2014-03-141-3/+1
* | | Fix global searchDmitriy Zaporozhets2014-03-142-1/+3
* | | Ignore newlines per md standard.Marin Jankovski2014-03-141-2/+1
* | | Fix mr process order on push.Dmitriy Zaporozhets2014-03-141-6/+5
* | | Merge branch 'ldap_connections'Dmitriy Zaporozhets2014-03-141-9/+11
|\ \ \
| * | | Open/close LDAP in ApplicationControllerJacob Vosmaer2014-03-141-9/+11
* | | | Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq...Dmitriy Zaporozhets2014-03-149-96/+167
|\ \ \ \ | |/ / / |/| | |
| * | | Remove default value for Project#importedDmitriy Zaporozhets2014-03-131-1/+0
| * | | Hide retry import form for non mastersDmitriy Zaporozhets2014-03-131-12/+13
| * | | Redirect to import page from show when import in progressDmitriy Zaporozhets2014-03-131-0/+5
| * | | Add retry feature to project importDmitriy Zaporozhets2014-03-123-6/+26
| * | | Project import and retry import scaffoldDmitriy Zaporozhets2014-03-124-55/+89
| * | | Add project import state machineDmitriy Zaporozhets2014-03-122-12/+22
| * | | Move project creation to serviceDmitriy Zaporozhets2014-03-122-25/+24
| * | | Improve import noticeDmitriy Zaporozhets2014-03-121-1/+1
| * | | Show import notice in callout blockDmitriy Zaporozhets2014-03-111-1/+1
| * | | Better explanation for import urlDmitriy Zaporozhets2014-03-111-2/+5
* | | | Correct BackgroundJobs page for both OSX and linuxDmitriy Zaporozhets2014-03-131-1/+1
* | | | Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitl...Dmitriy Zaporozhets2014-03-134-4/+8
|\ \ \ \
| * | | | Add button for toggling inline comments in diff view.Jacob Carlborg2014-02-225-4/+42