summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Clean up ci yaml doc [ci skip]yaml-ci-cleanupAchilleas Pipinellis2015-12-161-133/+212
* Merge branch 'fix-bad-merge' into 'master' Douwe Maan2015-12-161-1/+0
|\
| * Fix bad mergeStan Hu2015-12-161-1/+0
* | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
|\ \
| * | Fix endpoint not setting needed @ci_commitZeger-Jan van de Weg2015-12-161-6/+3
* | | Merge branch 'control-list-right-margin' into 'master' Dmitriy Zaporozhets2015-12-161-1/+5
|\ \ \ | |_|/ |/| |
| * | Fix right margin of control listDouwe Maan2015-12-161-1/+5
* | | Merge branch 'issuable-sidebar' into 'master' Dmitriy Zaporozhets2015-12-161-8/+8
|\ \ \
| * | | Revert "Fix "Notifications" label color"Douwe Maan2015-12-161-1/+1
| * | | Revert "Use regularly colored button for "Subscribe"/"Unsubscribe""Douwe Maan2015-12-161-1/+1
| * | | Use regularly colored button for "Subscribe"/"Unsubscribe"issuable-sidebarDouwe Maan2015-12-151-1/+1
| * | | Fix "Notifications" label colorDouwe Maan2015-12-151-1/+1
| * | | Move cross-project reference downDouwe Maan2015-12-151-8/+8
* | | | Merge branch 'fix-border' into 'master' Dmitriy Zaporozhets2015-12-164-4/+9
|\ \ \ \
| * | | | Fix double border in MR discussionDmitriy Zaporozhets2015-12-164-4/+9
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-168-297/+27
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl...Dmitriy Zaporozhets2015-12-166-1/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add open_issues_count to project APIStan Hu2015-12-116-1/+30
* | | | | 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
View Lorry Controller Status