Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Link to correct (source) project on MR builds tabmr-builds-fixes | Douwe Maan | 2015-12-16 | 1 | -4/+4 |
* | 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 '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 |
* | | | | | | | Merge branch 'add_user_repo_integrity_rake_task' into 'master' | Robert Speicher | 2015-12-15 | 4 | -5/+117 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ci skip] Add user repository integrity check rake task | Drew Blessing | 2015-12-14 | 4 | -5/+117 |
* | | | | | | | | Merge branch 'wider-layout' into 'master' | Andrey | 2015-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Increase fixed layout width to 1280pxwider-layout | Dmitriy Zaporozhets | 2015-12-11 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fix-panel-height' into 'master' | Dmitriy Zaporozhets | 2015-12-15 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fix inline panel heading height | Douwe Maan | 2015-12-15 | 1 | -1/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'tests/note-polling' into 'master' | Grzegorz Bizon | 2015-12-15 | 5 | -2/+34 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Trigger notes refresh in specs instead of waiting for ajaxtests/note-polling | Grzegorz Bizon | 2015-12-15 | 1 | -1/+1 |
| * | | | | | | Assign notes object to a variable | Grzegorz Bizon | 2015-12-15 | 1 | -1/+1 |
| * | | | | | | Add minor fixes in note polling specs | Grzegorz Bizon | 2015-12-15 | 1 | -4/+2 |
| * | | | | | | Add spinach test for note polling | Grzegorz Bizon | 2015-12-15 | 3 | -1/+17 |
| * | | | | | | Add feature specs for note polling | Grzegorz Bizon | 2015-12-15 | 1 | -0/+18 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'rs-issue-4032' into 'master' | Douwe Maan | 2015-12-15 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix note pollingrs-issue-4032 | Robert Speicher | 2015-12-12 | 1 | -1/+2 |
* | | | | | | | Merge branch 'preserve-trailing-new-lines-at-eof' into 'master' | Robert Speicher | 2015-12-14 | 4 | -2/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Preserve trailing new lines at the end of file on the online editor | Douglas Barbosa Alexandre | 2015-12-14 | 4 | -2/+21 |
* | | | | | | | | Merge branch 'contributing_md' into 'master' | Achilleas Pipinellis | 2015-12-14 | 1 | -118/+266 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | |