Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix Rubocop complain.fix_rubocop | Rubén Dávila | 2015-12-16 | 1 | -1/+1 |
* | Merge branch 'fix-bad-merge' into 'master' | Douwe Maan | 2015-12-16 | 1 | -1/+0 |
|\ | |||||
| * | Fix bad merge | Stan Hu | 2015-12-16 | 1 | -1/+0 |
* | | Merge branch 'fix-endpoint-not-setting-var' into 'master' | Douwe Maan | 2015-12-16 | 1 | -6/+3 |
|\ \ | |||||
| * | | Fix endpoint not setting needed @ci_commit | Zeger-Jan van de Weg | 2015-12-16 | 1 | -6/+3 |
* | | | Merge branch 'control-list-right-margin' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 1 | -1/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix right margin of control list | Douwe Maan | 2015-12-16 | 1 | -1/+5 |
* | | | Merge branch 'issuable-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 1 | -8/+8 |
|\ \ \ | |||||
| * | | | Revert "Fix "Notifications" label color" | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| * | | | Revert "Use regularly colored button for "Subscribe"/"Unsubscribe"" | Douwe Maan | 2015-12-16 | 1 | -1/+1 |
| * | | | Use regularly colored button for "Subscribe"/"Unsubscribe"issuable-sidebar | Douwe Maan | 2015-12-15 | 1 | -1/+1 |
| * | | | Fix "Notifications" label color | Douwe Maan | 2015-12-15 | 1 | -1/+1 |
| * | | | Move cross-project reference down | Douwe Maan | 2015-12-15 | 1 | -8/+8 |
* | | | | Merge branch 'fix-border' into 'master' | Dmitriy Zaporozhets | 2015-12-16 | 4 | -4/+9 |
|\ \ \ \ | |||||
| * | | | | Fix double border in MR discussion | Dmitriy Zaporozhets | 2015-12-16 | 4 | -4/+9 |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 8 | -297/+27 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'remove-author-from-email' into 'master' | Douwe Maan | 2015-12-16 | 1 | -2/+0 |
| |\ \ \ \ | |||||
| | * | | | | Revert "Make sure notify email always has author info."remove-author-from-email | Job van der Voort | 2015-12-15 | 1 | -2/+0 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'workhorse-passthrough' into 'master' | Kamil Trzciński | 2015-12-16 | 7 | -295/+27 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Update workhorse version in doc/install/installation.mdworkhorse-passthrough | Robert Speicher | 2015-12-15 | 1 | -1/+1 |
| | * | | | Gitlab-workhorse related 8.3 update changes | Jacob Vosmaer | 2015-12-15 | 1 | -1/+19 |
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passt... | Jacob Vosmaer | 2015-12-15 | 290 | -5131/+3393 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | Update init script options for gitlab-workhorse | Jacob Vosmaer | 2015-12-15 | 2 | -2/+3 |
| | * | | | Require gitlab-workhorse 0.5.0 | Jacob Vosmaer | 2015-12-15 | 1 | -1/+1 |
| | * | | | Pass all requests from NGINX to gitlab-workhorse | Jacob Vosmaer | 2015-12-11 | 2 | -290/+3 |
* | | | | | Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl... | Dmitriy Zaporozhets | 2015-12-16 | 6 | -1/+31 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add open_issues_count to project API | Stan Hu | 2015-12-11 | 6 | -1/+30 |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 5 | -13/+11 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rs-clipboard-fixes' into 'master' | Douwe Maan | 2015-12-16 | 5 | -13/+11 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixes | Robert Speicher | 2015-12-15 | 4 | -11/+11 |
| | * | | | | | Update CHANGELOG | Robert Speicher | 2015-12-15 | 1 | -2/+0 |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 4 | -17/+84 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'add_svn_2_git_docs' into 'master' | Achilleas Pipinellis | 2015-12-16 | 4 | -17/+84 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ci skip] Add SVN to Git migration documentation | Drew Blessing | 2015-12-15 | 4 | -17/+84 |
| | |/ / / / / | |||||
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 2 | -5/+10 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'rs-timeago' into 'master' | Douwe Maan | 2015-12-16 | 2 | -5/+10 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix time_ago_with_tooltip for activity feedrs-timeago | Robert Speicher | 2015-12-11 | 2 | -5/+10 |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-12-16 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'fix-profile-nav' into 'master' | Andrey | 2015-12-16 | 2 | -1/+6 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Make profile navigation full widefix-profile-nav | Dmitriy Zaporozhets | 2015-12-11 | 2 | -1/+6 |
* | | | | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop' | Dmitriy Zaporozhets | 2015-12-16 | 61 | -167/+199 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fixed CiServices validationfeature/update-rubocop | Gabriel Mazetto | 2015-12-15 | 2 | -4/+4 |
| * | | | | | | | Disabled Rails/Date cop | Gabriel Mazetto | 2015-12-15 | 1 | -0/+6 |
| * | | | | | | | Fixed Rubocop offenses | Gabriel Mazetto | 2015-12-15 | 58 | -154/+155 |
| * | | | | | | | Updated .rubocop.yml to match 0.35.x changes | Gabriel Mazetto | 2015-12-14 | 1 | -6/+30 |
| * | | | | | | | Updated Rubocop to latest version | Gabriel Mazetto | 2015-12-14 | 2 | -7/+8 |
* | | | | | | | | Merge branch 'lazy-reference-extractor' into 'master' | Robert Speicher | 2015-12-15 | 84 | -495/+546 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use lazy reference extractor to get issue's MRslazy-reference-extractor | Douwe Maan | 2015-12-15 | 2 | -6/+6 |
| * | | | | | | | | Banzai::XFilter -> Banzai::Filter::XFilter | Douwe Maan | 2015-12-15 | 3 | -4/+4 |
| * | | | | | | | | Move Markdown/reference logic from Gitlab::Markdown to Banzai | Douwe Maan | 2015-12-15 | 84 | -491/+542 |