summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Link to correct (source) project on MR builds tabmr-builds-fixesDouwe Maan2015-12-161-4/+4
* Merge branch 'remove-author-from-email' into 'master' Douwe Maan2015-12-161-2/+0
|\
| * Revert "Make sure notify email always has author info."remove-author-from-emailJob van der Voort2015-12-151-2/+0
* | Merge branch 'workhorse-passthrough' into 'master' Kamil TrzciƄski2015-12-167-295/+27
|\ \
| * | Update workhorse version in doc/install/installation.mdworkhorse-passthroughRobert Speicher2015-12-151-1/+1
| * | Gitlab-workhorse related 8.3 update changesJacob Vosmaer2015-12-151-1/+19
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passt...Jacob Vosmaer2015-12-15290-5131/+3393
| |\ \ | | |/
| * | Update init script options for gitlab-workhorseJacob Vosmaer2015-12-152-2/+3
| * | Require gitlab-workhorse 0.5.0Jacob Vosmaer2015-12-151-1/+1
| * | Pass all requests from NGINX to gitlab-workhorseJacob Vosmaer2015-12-112-290/+3
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-165-13/+11
|\ \ \
| * \ \ Merge branch 'rs-clipboard-fixes' into 'master' Douwe Maan2015-12-165-13/+11
| |\ \ \
| | * | | Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixesRobert Speicher2015-12-154-11/+11
| | * | | Update CHANGELOGRobert Speicher2015-12-151-2/+0
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-164-17/+84
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'add_svn_2_git_docs' into 'master' Achilleas Pipinellis2015-12-164-17/+84
| |\ \ \ \
| | * | | | [ci skip] Add SVN to Git migration documentationDrew Blessing2015-12-154-17/+84
| | |/ / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-162-5/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rs-timeago' into 'master' Douwe Maan2015-12-162-5/+10
| |\ \ \ \
| | * | | | Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-112-5/+10
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-162-1/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'fix-profile-nav' into 'master' Andrey2015-12-162-1/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Make profile navigation full widefix-profile-navDmitriy Zaporozhets2015-12-112-1/+6
* | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-1661-167/+199
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed CiServices validationfeature/update-rubocopGabriel Mazetto2015-12-152-4/+4
| * | | | | Disabled Rails/Date copGabriel Mazetto2015-12-151-0/+6
| * | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1558-154/+155
| * | | | | Updated .rubocop.yml to match 0.35.x changesGabriel Mazetto2015-12-141-6/+30
| * | | | | Updated Rubocop to latest versionGabriel Mazetto2015-12-142-7/+8
* | | | | | Merge branch 'lazy-reference-extractor' into 'master' Robert Speicher2015-12-1584-495/+546
|\ \ \ \ \ \
| * | | | | | Use lazy reference extractor to get issue's MRslazy-reference-extractorDouwe Maan2015-12-152-6/+6
| * | | | | | Banzai::XFilter -> Banzai::Filter::XFilterDouwe Maan2015-12-153-4/+4
| * | | | | | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1584-491/+542
* | | | | | | Merge branch 'add_user_repo_integrity_rake_task' into 'master' Robert Speicher2015-12-154-5/+117
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Add user repository integrity check rake taskDrew Blessing2015-12-144-5/+117
* | | | | | | | Merge branch 'wider-layout' into 'master' Andrey2015-12-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Increase fixed layout width to 1280pxwider-layoutDmitriy Zaporozhets2015-12-111-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-panel-height' into 'master' Dmitriy Zaporozhets2015-12-151-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix inline panel heading heightDouwe Maan2015-12-151-1/+4
|/ / / / / / /
* | | | | | | Merge branch 'tests/note-polling' into 'master' Grzegorz Bizon2015-12-155-2/+34
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Trigger notes refresh in specs instead of waiting for ajaxtests/note-pollingGrzegorz Bizon2015-12-151-1/+1
| * | | | | | Assign notes object to a variableGrzegorz Bizon2015-12-151-1/+1
| * | | | | | Add minor fixes in note polling specsGrzegorz Bizon2015-12-151-4/+2
| * | | | | | Add spinach test for note pollingGrzegorz Bizon2015-12-153-1/+17
| * | | | | | Add feature specs for note pollingGrzegorz Bizon2015-12-151-0/+18
|/ / / / / /
* | | | | | Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
|\ \ \ \ \ \
| * | | | | | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
* | | | | | | Merge branch 'preserve-trailing-new-lines-at-eof' into 'master' Robert Speicher2015-12-144-2/+21
|\ \ \ \ \ \ \
| * | | | | | | Preserve trailing new lines at the end of file on the online editorDouglas Barbosa Alexandre2015-12-144-2/+21
* | | | | | | | Merge branch 'contributing_md' into 'master' Achilleas Pipinellis2015-12-141-118/+266
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |