summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ui/miscui/miscDouwe Maan2015-12-0862-218/+474
|\
| * Merge branch 'rs-validators' into 'master' Douwe Maan2015-12-0828-109/+231
| |\
| | * Inline Gitlab::Blacklist in NamespaceValidatorrs-validatorsRobert Speicher2015-12-072-38/+32
| | * Add custom NamespaceNameValidatorRobert Speicher2015-12-072-3/+13
| | * Add custom NamespaceValidatorRobert Speicher2015-12-075-12/+46
| | * Add custom LineCodeValidatorRobert Speicher2015-12-073-2/+14
| | * Minor EmailValidator refactorRobert Speicher2015-12-071-7/+4
| | * Add custom ColorValidatorRobert Speicher2015-12-077-14/+47
| | * Move EmailValidator to app/validatorsRobert Speicher2015-12-071-0/+0
| | * Add custom UrlValidatorRobert Speicher2015-12-0710-37/+79
| * | Merge branch 'fix-merge-request-that-removes-submodule' into 'master' Douwe Maan2015-12-085-3/+48
| |\ \
| | * \ Merge branch 'master' into fix-merge-request-that-removes-submodulefix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-0724-59/+133
| | |\ \
| | * \ \ Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-0789-566/+1496
| | |\ \ \
| | * | | | Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre2015-12-045-3/+48
| * | | | | Merge branch 'gemfile_fix' into 'master' Valery Sizov2015-12-082-1/+3
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | add explicit reference to rouge 1.10.1gemfile_fixValery Sizov2015-12-082-1/+3
| |/ / / /
| * | | | Merge branch 'fix-random-test' into 'master' Dmitriy Zaporozhets2015-12-083-4/+16
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix random failing test - delete attachmentfix-random-testDmitriy Zaporozhets2015-12-073-4/+16
| |/ / /
| * | | Merge branch 'rs-spec-failure' into 'master' Robert Speicher2015-12-071-1/+1
| |\ \ \
| | * | | Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9Robert Speicher2015-12-071-1/+1
| * | | | Merge branch 'fix-random-failing-test' into 'master' Dmitriy Zaporozhets2015-12-072-2/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix random failing testDmitriy Zaporozhets2015-12-072-2/+8
| * | | | Merge branch 'pberndt:master' into 'master' Robert Speicher2015-12-071-1/+1
| |\ \ \ \
| | * | | | time_ago_with_tooltip javascript snippet: Don't reinitialize older elementsPhillip Berndt2015-12-031-1/+1
| * | | | | Merge branch 'fix-parallel-merge' into 'master' Dmitriy Zaporozhets2015-12-072-2/+3
| |\ \ \ \ \
| | * | | | | Dont use cached collection for Repository find_branch and find_tag methodsDmitriy Zaporozhets2015-12-072-2/+3
| * | | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-075-23/+29
| |\ \ \ \ \ \
| | * | | | | | Fix specStan Hu2015-12-041-3/+1
| | * | | | | | Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-044-20/+28
| * | | | | | | Merge branch 'add_assign_to_me' into 'master' Dmitriy Zaporozhets2015-12-070-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Filter current user to the top of issue assignee listDrew Blessing2015-12-031-1/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fix-api-private-project-update' into 'master' Dmitriy Zaporozhets2015-12-073-2/+19
| |\ \ \ \ \ \
| | * | | | | | Fix API setting of 'public' attribute to false will make a project privateStan Hu2015-12-053-2/+19
| * | | | | | | Merge branch 'minimize-readme' into 'master' Dmitriy Zaporozhets2015-12-072-2/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Move release cycle comments to the documentation.minimize-readmeSytse Sijbrandij2015-12-052-2/+6
| * | | | | | | | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-076-21/+49
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-046-21/+49
| * | | | | | | | Merge branch 'fix-docker-syntax' into 'master' Kamil Trzciński2015-12-071-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Update Docker SyntaxMichael A. Smith2015-12-071-1/+1
| |/ / / / / / /
| * | | | | | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-077-45/+58
| |\ \ \ \ \ \ \
| | * | | | | | | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-073-18/+11
| | * | | | | | | fox specsValery Sizov2015-12-074-17/+28
| | * | | | | | | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-046-42/+51
| * | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-12-071-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #9892 from stetskevych/fix_nginx_ssl_configJacob Vosmaer2015-12-071-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix gitlab-ssl nginx config to work when multiple server_names are served ove...Vyacheslav Stetskevych2015-12-061-1/+1
* | | | | | | | | | | Remove pointless explanation for user tabsDouwe Maan2015-12-072-16/+8
* | | | | | | | | | | Merge branch 'master' into ui/miscDouwe Maan2015-12-07234-1355/+2617
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-078-10/+48
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Satisfy RubocopDouwe Maan2015-12-071-1/+1
View Lorry Controller Status