Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | testkamil-test | Kamil Trzcinski | 2016-03-03 | 0 | -0/+0 |
* | Merge branch 'add_customer_label' into 'master' | Douwe Maan | 2016-03-01 | 1 | -11/+8 |
|\ | |||||
| * | Add customer label explanation and change label references to markdown [ci skip] | Drew Blessing | 2016-03-01 | 1 | -11/+8 |
* | | Merge branch 'fix/commit-status-api-improvement' into 'master' | Douwe Maan | 2016-03-01 | 3 | -58/+117 |
|\ \ | |||||
| * | | Improve commit status API specsfix/commit-status-api-improvement | Grzegorz Bizon | 2016-03-01 | 1 | -30/+19 |
| * | | Check if commit exists first in commit status API | Grzegorz Bizon | 2016-03-01 | 1 | -1/+1 |
| * | | Add Changelog entry for commit status API changes | Grzegorz Bizon | 2016-02-29 | 1 | -0/+1 |
| * | | Improve commit status API specs (refactoring) | Grzegorz Bizon | 2016-02-29 | 1 | -41/+76 |
| * | | Return empty array when commit has no statuses in API | Grzegorz Bizon | 2016-02-29 | 2 | -41/+75 |
* | | | Merge branch 'rel-url-fix' into 'master' | Douwe Maan | 2016-03-01 | 6 | -13/+30 |
|\ \ \ | |||||
| * | | | Include relative url configuration in rake tasks | Artem Sidorenko | 2016-02-29 | 2 | -0/+4 |
| * | | | Use dedicated relative_url.rb initializer | Artem Sidorenko | 2016-02-29 | 4 | -13/+26 |
* | | | | Merge branch 'login-flash' into 'master' | Dmitriy Zaporozhets | 2016-03-01 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Add bottom margin for flash container on login page | Dmitriy Zaporozhets | 2016-03-01 | 1 | -0/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'sidebar-overlap-fix' into 'master' | Dmitriy Zaporozhets | 2016-03-01 | 3 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Fix issue with overlap of sidebar links. | Jacob Schatz | 2016-03-01 | 3 | -3/+3 |
| |/ / / | |||||
* | | | | Merge branch 'rs-wiki-toc' into 'master' | Douwe Maan | 2016-03-01 | 3 | -8/+85 |
|\ \ \ \ | |||||
| * | | | | Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilterrs-wiki-toc | Robert Speicher | 2016-02-23 | 3 | -8/+85 |
* | | | | | Merge branch 'rs-avatar-validation' into 'master' | Douwe Maan | 2016-03-01 | 2 | -2/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Only validate avatar cropping values when avatar is present AND changedrs-avatar-validation | Robert Speicher | 2016-02-29 | 2 | -2/+16 |
* | | | | | | Merge branch 'rs-fix-user-namespace_uniq' into 'master' | Douwe Maan | 2016-03-01 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniq | Robert Speicher | 2016-02-29 | 1 | -1/+2 |
* | | | | | | Merge branch 'rs-improve-grace-period' into 'master' | Douwe Maan | 2016-03-01 | 4 | -10/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-period | Robert Speicher | 2016-02-29 | 1 | -5/+7 |
| * | | | | | | Reset `otp_grace_period_started_at` after disabling 2FA | Robert Speicher | 2016-02-29 | 3 | -5/+9 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'fix-failing-tests' into 'master' | Kamil Trzciński | 2016-03-01 | 1 | -0/+6 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Precompile assets before all spinach tests | Kamil Trzcinski | 2016-03-01 | 1 | -0/+6 |
|/ / / / / | |||||
* | | | | | Merge branch 'mr-prefix-activity-view' into 'master' | Jacob Schatz | 2016-03-01 | 6 | -6/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Changed page title | Phil Hughes | 2016-03-01 | 1 | -1/+1 |
| * | | | | | Fixed issue based on feedback with link text output | Phil Hughes | 2016-03-01 | 1 | -1/+1 |
| * | | | | | Removed un-used variables | Phil Hughes | 2016-03-01 | 2 | -3/+1 |
| * | | | | | Replaced prefix with to_reference method calls | Phil Hughes | 2016-03-01 | 5 | -11/+7 |
| * | | | | | Changed # to ! on merge requests on activity view | Phil Hughes | 2016-03-01 | 4 | -5/+12 |
* | | | | | | Merge branch 'comment-batch-size' into 'master' | Douwe Maan | 2016-03-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Batch size >1000 does not pay offcomment-batch-size | Jacob Vosmaer | 2016-02-25 | 1 | -1/+1 |
* | | | | | | | Merge branch 'safe-content-type' into 'master' | Douwe Maan | 2016-03-01 | 3 | -12/+23 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Explain why we mangle blob content typessafe-content-type | Jacob Vosmaer | 2016-02-24 | 3 | -12/+23 |
* | | | | | | | Merge branch 'rs-update-rails' into 'master' | Dmitriy Zaporozhets | 2016-03-01 | 2 | -31/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update Rails to 4.2.5.2 | Robert Speicher | 2016-02-29 | 2 | -31/+31 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'issue_13851' into 'master' | Rémy Coutable | 2016-03-01 | 1 | -1/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bring back Gitlab textissue_13851 | Alfredo Sumaran | 2016-02-29 | 1 | -1/+14 |
* | | | | | | | | Merge branch 'fix/contributions-forked-projects' into 'master' | Douwe Maan | 2016-03-01 | 3 | -1/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio... | James Lopez | 2016-02-29 | 194 | -865/+5348 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | include contributions from forked projects on profile calendar | James Lopez | 2016-02-22 | 3 | -1/+20 |
* | | | | | | | | | | Merge branch 'feature/slacky-builds-v2' into 'master' | James Lopez | 2016-03-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix syntax error | James Lopez | 2016-03-01 | 1 | -1/+1 |
| * | | | | | | | | | | added commit message to slack script | James Lopez | 2016-03-01 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'triggers_link' into 'master' | Achilleas Pipinellis | 2016-03-01 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add link to triggers doc in variables section | Achilleas Pipinellis | 2016-03-01 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch 'issue_13212' into 'master' | Jacob Schatz | 2016-02-29 | 3 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | |