summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-155-3/+31
* Merge branch 'rs-update-uglifier' into 'master' Dmitriy Zaporozhets2015-10-152-3/+3
|\
| * Update uglifier to ~> 2.7.2rs-update-uglifierRobert Speicher2015-10-142-3/+3
* | Merge branch 'rs-issues_sentence' into 'master' Douwe Maan2015-10-151-1/+1
|\ \
| * | Simplify the `issues_sentence` helperrs-issues_sentenceRobert Speicher2015-10-141-1/+1
* | | Merge branch 'rs-mr-tabs-scroll' into 'master' Douwe Maan2015-10-151-4/+4
|\ \ \
| * | | Prevent a JS error in MergeRequestTabsrs-mr-tabs-scrollRobert Speicher2015-10-141-4/+4
* | | | Merge branch 'incoming-email-config' into 'master' Robert Speicher2015-10-1410-254/+201
|\ \ \ \
| * | | | Shut up, RubocopRobert Speicher2015-10-141-1/+1
| * | | | Add defaults for incoming_email ssl and start_tls.incoming-email-configDouwe Maan2015-10-141-4/+6
| * | | | Make Reply by email easier to configureDouwe Maan2015-10-1310-254/+199
* | | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-1419-113/+70
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make Mentionable#cross_reference_exists? private.simplify-cross-referencesDouwe Maan2015-10-142-13/+6
| * | | | Shut up, RubocopRobert Speicher2015-10-141-1/+1
| * | | | Use `to_reference` where possible.Douwe Maan2015-10-131-2/+2
| * | | | Fix mentionable specsDouwe Maan2015-10-124-7/+6
| * | | | Remove useless assignmentDouwe Maan2015-10-121-1/+1
| * | | | Chaining ftwDouwe Maan2015-10-121-5/+1
| * | | | Fix cross-references originating from notesDouwe Maan2015-10-124-20/+7
| * | | | Simplify code around (cross)-referencesDouwe Maan2015-10-1214-76/+58
* | | | | Merge branch 'show_pending_warning' into 'master' Kamil Trzciński2015-10-1415-24/+257
|\ \ \ \ \
| * | | | | Fix warning signshow_pending_warningKamil Trzcinski2015-10-143-6/+5
| * | | | | Fix specsKamil Trzcinski2015-10-141-1/+1
| * | | | | Show warning if build doesn't have runners with specified tags or runners did...Kamil Trzcinski2015-10-1414-22/+256
* | | | | | Merge branch 'predefined_build_variables' into 'master' Kamil Trzciński2015-10-145-19/+70
|\ \ \ \ \ \
| * | | | | | Use tag? instead of tag to indicate that this is booleanpredefined_build_variablesKamil Trzcinski2015-10-141-1/+1
| * | | | | | Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI buildsKamil Trzcinski2015-10-145-19/+70
| |/ / / / /
* | | | | | Merge branch 'uploads_path_fix' into 'master' Valery Sizov2015-10-1417-10/+225
|\ \ \ \ \ \
| * | | | | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-1417-10/+225
* | | | | | | Merge branch 'revert_service_passwd' into 'master' Valery Sizov2015-10-146-78/+13
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Revert "Improve invalidation of stored service password if the endpoint URL i...Valery Sizov2015-10-146-78/+13
|/ / / / / /
* | | | | | Merge branch 'fix/improve_reset_service_password' into 'master' Valery Sizov2015-10-146-13/+78
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve invalidation of stored service password if the endpoint URL is changedAlex Lossent2015-10-146-13/+78
* | | | | | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-145-3/+53
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-145-3/+53
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-125-3/+53
* | | | | | Fix spinach tests introduced by 07101cfab61f28c6328efebea98f018ab8356cddKamil Trzcinski2015-10-142-8/+8
* | | | | | Merge remote-tracking branch 'origin/inified_404_error'Valery Sizov2015-10-1415-24/+21
|\ \ \ \ \ \
| * | | | | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-1315-24/+21
* | | | | | | Merge branch 'fix-retry-and-cancel' into 'master' Kamil Trzciński2015-10-144-15/+27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix retry and cancel for buildfix-retry-and-cancelKamil Trzcinski2015-10-144-15/+27
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix_issue_2906' into 'master' Douwe Maan2015-10-142-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use css styleЧингиз Ауанасов2015-10-132-2/+4
| * | | | | + and Titleize New Project button on dashboardЧингиз Ауанасов2015-10-102-2/+2
* | | | | | Merge branch 'mailroom-arbitration' into 'master' Robert Speicher2015-10-134-8/+44
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove warning about Reply by email and HAmailroom-arbitrationDouwe Maan2015-10-121-4/+0
| * | | | | Enable arbitration in MailRoomDouwe Maan2015-10-114-4/+44
| | |_|_|/ | |/| | |
* | | | | Merge branch 'stanhu/gitlab-ce-wiki-add-new-page-in-pages-tab'Dmitriy Zaporozhets2015-10-132-0/+2
|\ \ \ \ \
| * | | | | Add "New Page" button to Wiki Pages tabStan Hu2015-10-122-0/+2
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-10-136-5/+22
|\ \ \ \ \ \
View Lorry Controller Status