summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add commit message to JIRA's notification payload.issue_5854_fix_specRubén Dávila2016-03-022-4/+6
* Merge branch 'logged-out-search' into 'master' Robert Speicher2016-03-0111-43/+72
|\
| * Refactor UI header for logged out usersDmitriy Zaporozhets2016-03-013-47/+28
| * Add CHANGELOG and testlogged-out-searchDmitriy Zaporozhets2016-03-013-0/+32
| * Enable search for logged-out usersDmitriy Zaporozhets2016-03-016-6/+22
* | Merge branch 'document-design-to-development-process' into 'master' Achilleas Pipinellis2016-03-012-50/+118
|\ \
| * | Add a paragraph on "Implementing design & UI elements" in CONTRIBUTING.mdRémy Coutable2016-03-012-50/+118
|/ /
* | Merge branch 'add_customer_label' into 'master' Douwe Maan2016-03-011-11/+8
|\ \
| * | Add customer label explanation and change label references to markdown [ci skip]Drew Blessing2016-03-011-11/+8
| |/
* | Merge branch 'fix/commit-status-api-improvement' into 'master' Douwe Maan2016-03-013-58/+117
|\ \
| * | Improve commit status API specsfix/commit-status-api-improvementGrzegorz Bizon2016-03-011-30/+19
| * | Check if commit exists first in commit status APIGrzegorz Bizon2016-03-011-1/+1
| * | Add Changelog entry for commit status API changesGrzegorz Bizon2016-02-291-0/+1
| * | Improve commit status API specs (refactoring)Grzegorz Bizon2016-02-291-41/+76
| * | Return empty array when commit has no statuses in APIGrzegorz Bizon2016-02-292-41/+75
* | | Merge branch 'rel-url-fix' into 'master' Douwe Maan2016-03-016-13/+30
|\ \ \
| * | | Include relative url configuration in rake tasksArtem Sidorenko2016-02-292-0/+4
| * | | Use dedicated relative_url.rb initializerArtem Sidorenko2016-02-294-13/+26
* | | | Merge branch 'login-flash' into 'master' Dmitriy Zaporozhets2016-03-011-0/+4
|\ \ \ \
| * | | | Add bottom margin for flash container on login pageDmitriy Zaporozhets2016-03-011-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'sidebar-overlap-fix' into 'master' Dmitriy Zaporozhets2016-03-013-3/+3
|\ \ \ \
| * | | | Fix issue with overlap of sidebar links.Jacob Schatz2016-03-013-3/+3
| |/ / /
* | | | Merge branch 'rs-wiki-toc' into 'master' Douwe Maan2016-03-013-8/+85
|\ \ \ \
| * | | | Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilterrs-wiki-tocRobert Speicher2016-02-233-8/+85
* | | | | Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-012-2/+16
|\ \ \ \ \
| * | | | | Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-292-2/+16
* | | | | | Merge branch 'rs-fix-user-namespace_uniq' into 'master' Douwe Maan2016-03-011-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniqRobert Speicher2016-02-291-1/+2
* | | | | | Merge branch 'rs-improve-grace-period' into 'master' Douwe Maan2016-03-014-10/+16
|\ \ \ \ \ \
| * | | | | | Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-periodRobert Speicher2016-02-291-5/+7
| * | | | | | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-293-5/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-failing-tests' into 'master' Kamil Trzciński2016-03-011-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Precompile assets before all spinach testsKamil Trzcinski2016-03-011-0/+6
|/ / / / /
* | | | | Merge branch 'mr-prefix-activity-view' into 'master' Jacob Schatz2016-03-016-6/+7
|\ \ \ \ \
| * | | | | Changed page titlePhil Hughes2016-03-011-1/+1
| * | | | | Fixed issue based on feedback with link text outputPhil Hughes2016-03-011-1/+1
| * | | | | Removed un-used variablesPhil Hughes2016-03-012-3/+1
| * | | | | Replaced prefix with to_reference method callsPhil Hughes2016-03-015-11/+7
| * | | | | Changed # to ! on merge requests on activity viewPhil Hughes2016-03-014-5/+12
* | | | | | Merge branch 'comment-batch-size' into 'master' Douwe Maan2016-03-011-1/+1
|\ \ \ \ \ \
| * | | | | | Batch size >1000 does not pay offcomment-batch-sizeJacob Vosmaer2016-02-251-1/+1
* | | | | | | Merge branch 'safe-content-type' into 'master' Douwe Maan2016-03-013-12/+23
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Explain why we mangle blob content typessafe-content-typeJacob Vosmaer2016-02-243-12/+23
* | | | | | | Merge branch 'rs-update-rails' into 'master' Dmitriy Zaporozhets2016-03-012-31/+31
|\ \ \ \ \ \ \
| * | | | | | | Update Rails to 4.2.5.2Robert Speicher2016-02-292-31/+31
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issue_13851' into 'master' Rémy Coutable2016-03-011-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Bring back Gitlab textissue_13851Alfredo Sumaran2016-02-291-1/+14
* | | | | | | | Merge branch 'fix/contributions-forked-projects' into 'master' Douwe Maan2016-03-013-1/+20
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio...James Lopez2016-02-29194-865/+5348
| |\ \ \ \ \ \ \ \
| * | | | | | | | | include contributions from forked projects on profile calendarJames Lopez2016-02-223-1/+20