summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove duplicate 'cache_store' configuration in test environmentremove-duplicate-cache_store-in-test-configRémy Coutable2016-03-021-2/+0
* Merge branch 'fix/wrong-anchor-in-process' into 'master' Achilleas Pipinellis2016-03-021-1/+1
|\
| * Fix wrong anchor in PROCESS.mdRémy Coutable2016-03-021-1/+1
* | Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master' Rémy Coutable2016-03-022-1/+2
|\ \ | |/ |/|
| * Fix import from gitlab.comKazuki Sawada2016-03-022-1/+2
|/
* Merge branch 'shortcuts-help' into 'master' Rémy Coutable2016-03-022-1/+4
|\
| * Fix help keyboard shortcut for relative URL setupsArtem Sidorenko2016-03-012-1/+4
* | Merge branch 'rs-update-sprockets' into 'master' Dmitriy Zaporozhets2016-03-022-11/+7
|\ \
| * | Bump sprockets to `~> 3.3.5`rs-update-sprocketsRobert Speicher2016-03-012-11/+7
* | | Merge branch 'notes_guidelines' into 'master' Achilleas Pipinellis2016-03-021-3/+13
|\ \ \
| * | | Change doc styleguide to use quotes for notesnotes_guidelinesAchilleas Pipinellis2016-02-291-3/+13
* | | | Merge branch 'saml-doc-update' into 'master' Achilleas Pipinellis2016-03-022-49/+138
|\ \ \ \ | |_|/ / |/| | |
| * | | Style updates.saml-doc-updatePatricio Cano2016-03-012-20/+30
| * | | Updated SAML and Omniauth docs with information on the new behavior recently ...Patricio Cano2016-02-232-47/+126
* | | | 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