summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve error reporting on users APIjubianchi2014-09-1615-103/+370
| | | | | | | | * users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username * MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks * issues * labels * projects
* Merge branch 'redis_socket' into 'master'Dmitriy Zaporozhets2014-09-154-4/+46
|\ | | | | | | | | | | Use sockets to connect to Redis See merge request !1088
| * Use sockets to connect to RedisJacob Vosmaer2014-09-124-4/+46
| |
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-152-5/+5
|\ \
| * \ Merge pull request #7753 from tamers/patch-1Robert Schilling2014-09-141-1/+1
| |\ \ | | | | | | | | Fix grammatical error in 'not merged changes' msg
| | * | Fix grammatical error in 'not merged changes' msgTamer Sherif2014-09-141-1/+1
| |/ /
| * | Merge pull request #7528 from exromany/patch-1Robert Schilling2014-09-131-4/+4
| |\ \ | | | | | | | | Update user_management.md
| | * | move env to end of linesexromany2014-08-191-4/+4
| | | |
| | * | Update user_management.mdexromany2014-08-181-4/+4
| | | | | | | | | | | | add rails_env to commands
* | | | Merge branch 'implement_comments_on_parallel_diff' into 'master'Dmitriy Zaporozhets2014-09-157-48/+105
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Implement comments on parallel diff Fixes #1565 See merge request !1090
| * | | Fix diff_helper spec.Marin Jankovski2014-09-121-26/+27
| | | |
| * | | Add one feature test.Marin Jankovski2014-09-122-0/+20
| | | |
| * | | Move organizing of comments to helper.Marin Jankovski2014-09-122-14/+22
| | | |
| * | | Remove unecesarry array operations.Marin Jankovski2014-09-123-17/+16
| | | |
| * | | Add comments on the side-by-side diff.Marin Jankovski2014-09-124-15/+44
| | | |
* | | | Merge pull request #7749 from wesgurn/masterDmitriy Zaporozhets2014-09-134-3/+9
|\ \ \ \ | | | | | | | | | | Adding ability to configure webhook timeout via gitlab.yml
| * | | | Adding ability to configure webhook timeout via gitlab.ymlWes Gurney2014-09-124-3/+9
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-09-122-14/+8
|\ \ \ \ \
| * \ \ \ \ Merge pull request #7741 from Razer6/refactor/remove_duplicate_stepsMarin Jankovski2014-09-122-14/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | [Refactor] Remove duplicated labels step
| | * | | | | Remove duplicated labels stepRobert Schilling2014-09-122-14/+8
| | | | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2014-09-123-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge pull request #7743 from bbodenmiller/patch-12Robert Schilling2014-09-121-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | formatting changes, table->database
| | * | | | | formatting changes, table->databaseBen Bodenmiller2014-09-121-2/+2
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Make formatting consistent on page. Change table -> database as they are database permissions.
| * | | | | Merge pull request #7712 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-122-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | set fail_timeout=0 as recommended by Unicorn
| | * | | | fail_timeout=0 as recommended by UnicornBen Bodenmiller2014-09-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set's fail_timeout=0 as recommended by http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-timeout when Unicorn is running behind nginx.
* | | | | | Merge branch 'backlog_socket' into 'master'Dmitriy Zaporozhets2014-09-122-3/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Use the default Unicorn socket backlog value: 1024 See merge request !1087
| * | | | | Use the default Unicorn socket backlog value: 1024Jacob Vosmaer2014-09-122-3/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #7662 from Razer6/disable_buttons_on_empty_formDmitriy Zaporozhets2014-09-123-7/+12
|\ \ \ \ \ | | | | | | | | | | | | [UX] Disable buttons if form is empty
| * | | | | Disable buttons if required forms are emptyRobert Schilling2014-09-113-7/+12
| | |_|/ / | |/| | |
* | | | | Merge pull request #7522 from Razer6/fix_tags_countDmitriy Zaporozhets2014-09-126-14/+56
|\ \ \ \ \ | | | | | | | | | | | | [UX] Update tag count if tag gets deleted via web interface
| * | | | | update tags count if tag gets deletedRobert Schilling2014-09-126-14/+56
| |/ / / /
* | | | | Merge pull request #7439 from bbodenmiller/patch-6Robert Schilling2014-09-121-0/+4
|\ \ \ \ \ | | | | | | | | | | | | set the number of workers to # of cores
| * | | | | set the number of workers to # of coresBen Bodenmiller2014-09-121-0/+4
| | | | | |
* | | | | | Merge pull request #7713 from bbodenmiller/patch-5Sytse Sijbrandij2014-09-121-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add Feedback link
| * | | | | add requests linkBen Bodenmiller2014-09-121-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | Add requests link for feature requests.
* | | | | Merge pull request #7737 from Razer6/feature/zenmasterDmitriy Zaporozhets2014-09-129-8/+216
|\ \ \ \ \ | | | | | | | | | | | | Zen Mode for issues/MR/notes
| * | | | | Close Zen mode by ESC, foward/backwardRobert Schilling2014-09-115-3/+60
| | | | | |
| * | | | | Implement zen mode for issues/MRs/notesRobert Schilling2014-09-115-6/+157
| | |_|/ / | |/| | | | | | | | | | | | | Close Zen mode by ESC, foward/backward
* | | | | Merge pull request #7738 from dblessing/serialize_migration_fixDmitriy Zaporozhets2014-09-122-2/+8
|\ \ \ \ \ | |/ / / / |/| | | | Fix serialize migration
| * | | | Fix serialize migration. Fixes #7734Drew Blessing2014-09-112-2/+8
| | | | |
* | | | | Merge pull request #7733 from bbodenmiller/patch-12Robert Schilling2014-09-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | update grant command to match how mysql shows
| * | | | update grant command to match how mysql showsBen Bodenmiller2014-09-111-1/+1
| | | | | | | | | | | | | | | When looking up the granted permissions for users in MySQL using `show grants for 'git'@'localhost';` it shows the permissions in this order regardless of how you enter them. Changing so that comparing your actual permissions vs. what installation guide says is easier.
* | | | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-09-116-141/+190
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature oauth refactoring Only use class methods when needed. In addition, make a proper extension of Gitlab::Oauth::User. See merge request !1062
| * | | | | Update Gemfile.lockJan-Willem van der Meer2014-09-111-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into feature-oauth-refactoringJan-Willem van der Meer2014-09-11167-909/+2250
| |\ \ \ \ \ | | |/ / / /
| * | | | | Remove duplicated create methodJan-Willem van der Meer2014-09-081-10/+0
| | | | | |
| * | | | | Test authenticate method for Gitlab::LDAP::UserJan-Willem van der Meer2014-09-082-11/+32
| | | | | |
| * | | | | Ensure Gitlab::LDAP::authentication is testedJan-Willem van der Meer2014-09-081-0/+17
| | | | | |
| * | | | | Refactor gitlab auth testsJan-Willem van der Meer2014-09-081-11/+13
| | | | | |
| * | | | | Add new Gitlab::Oauth::AuthHash classJan-Willem van der Meer2014-09-041-0/+54
| | | | | |
View Lorry Controller Status