summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
|
* Merge branch 'remove-author-from-email' into 'master' Douwe Maan2015-12-161-2/+0
|\ | | | | | | | | | | | | Revert "Make sure notify email always has author info." This reverts commit 303f79f8046876c7a461708dee5d1f50f12737bf. See merge request !2103
| * Revert "Make sure notify email always has author info."remove-author-from-emailJob van der Voort2015-12-151-2/+0
| | | | | | | | This reverts commit 303f79f8046876c7a461708dee5d1f50f12737bf.
* | Merge branch 'workhorse-passthrough' into 'master' Kamil Trzciński2015-12-167-295/+27
|\ \ | | | | | | | | | | | | | | | | | | Pass all requests from NGINX to gitlab-workhorse See merge request !2073
| * | 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 ↵Jacob Vosmaer2015-12-15290-5131/+3393
| |\ \ | | |/ | | | | | | workhorse-passthrough
| * | 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#show See merge request !2108
| | * | | Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixesRobert Speicher2015-12-154-11/+11
| | | | |
| | * | | Update CHANGELOGRobert Speicher2015-12-151-2/+0
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SVN to Git migration documentation Document the process of migrating a SVN repository and pushing it to GitLab. cc/ @axil See merge request !2028
| | * | | | [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 feed Closes #4002 See merge request !2074
| | * | | | Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-112-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Closes #4002
* | | | | | 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 wide Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> ## Before ![Administrator___GitLab](/uploads/a43e8992264ed78afa732e7a911ef154/Administrator___GitLab.png) ## After ![Administrator___GitLab1](/uploads/9e67e8af071d4879045311abe15a7bba/Administrator___GitLab1.png) See merge request !2076
| | * | | | Make profile navigation full widefix-profile-navDmitriy Zaporozhets2015-12-112-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Markdown/reference logic from `Gitlab::Markdown` to `Banzai` - Moves from `Gitlab::Markdown` to `Banzai` - Moves filters and pipelines into their own namespace: `Banzai::Filter` and `Banzai::Pipeline` - No more `autoload`! - Split up `Gitlab::ReferenceExtractor` into `Banzai::ReferenceExtractor` and `Gitlab::ReferenceExtractor` - Replace `something(load_lazy_references: true)` by `Gitlab::ReferenceExtractor.lazily { something }` Goes from: ```ruby def referenced_merge_requests references = [self, *notes].flat_map do |note| note.all_references(load_lazy_references: false).merge_requests end.uniq! Gitlab::Markdown::ReferenceFilter::LazyReference.load(references).uniq.sort_by(&:iid) end ``` to ```ruby def referenced_merge_requests Gitlab::ReferenceExtractor.lazily do [self, *notes].flat_map do |note| note.all_references.merge_requests end end.sort_by(&:iid) end ``` See merge request !2027
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user repository integrity check rake task Corrupt repositories and stuck lock files can cause weird issues in GitLab. Often we know which user is having these problems and then we have to go hunt down which repository is causing it. Several times recently that involved me running queries in the rails console to get an array of projects and then writing a quick Ruby script to loop through and run `git fsck`. This last time I also had to check for the existence of `config.lock` and ref lock files. This rake task will eliminate all of those steps and allow an admin to simply specify a username. I also added the lock file checks to the existing `gitlab:repo:check` task which goes through all projects. See merge request !2080
| * | | | | | | [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 1280px Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @creamzy See merge request !2075
| * | | | | | | | Increase fixed layout width to 1280pxwider-layoutDmitriy Zaporozhets2015-12-111-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'fix-panel-height' into 'master' Dmitriy Zaporozhets2015-12-151-1/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inline panel heading height The `line-height` was added so that headings in the panels on the settings page had the same height as headings elsewhere, but the style applied everywhere :) Before: (Look at the "Unstarted Issues" heading) ![Screen_Shot_2015-12-15_at_17.39.46](/uploads/9dbea4c8b28e3c43bb5d4b5226d7a1ec/Screen_Shot_2015-12-15_at_17.39.46.png) ![Screen_Shot_2015-12-15_at_17.40.19](/uploads/97898418e9a66954c02e8a68b21c08b9/Screen_Shot_2015-12-15_at_17.40.19.png) After: ![Screen_Shot_2015-12-15_at_17.40.45](/uploads/5748aba032889053dd778b39e96fa301/Screen_Shot_2015-12-15_at_17.40.45.png) ![Screen_Shot_2015-12-15_at_17.40.40](/uploads/20240cdc7a6d5665cd32556d1a0e6c1d/Screen_Shot_2015-12-15_at_17.40.40.png) cc @skyruler cc @rspeicher 8.3 please! See merge request !2106
| * | | | | | | Fix inline panel heading heightDouwe Maan2015-12-151-1/+4
|/ / / / / / /
* | | | | | | Merge branch 'tests/note-polling' into 'master' Grzegorz Bizon2015-12-155-2/+34
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature specs for note polling Ref. #4032, !2084 cc @rspeicher See merge request !2086
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time.
| * | | | | | Add feature specs for note pollingGrzegorz Bizon2015-12-151-0/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | Ref. #4032, !2084
* | | | | | Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note polling Closes #4032 See merge request !2084
| * | | | | | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4032
* | | | | | | 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 editor Fixes #3784 Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up. See merge request !2099
| * | | | | | | Preserve trailing new lines at the end of file on the online editorDouglas Barbosa Alexandre2015-12-144-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up.
* | | | | | | | Merge branch 'contributing_md' into 'master' Achilleas Pipinellis2015-12-141-118/+266
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up CONTRIBUTING.md * Use 80 chars width where possible * Remove easyfix label reference * Add new issue submission template * Add long links to the bottom of the page See merge request !2100