Commit Graph
21651 Commits
Author SHA1 Message Date
Douwe Maan d60047bb31 Merge branch 'remove-author-from-email' into 'master'
Revert "Make sure notify email always has author info."

This reverts commit 303f79f804.

See merge request !2103
2015-12-16 13:51:45 +00:00
Kamil Trzciński 089696b462 Merge branch 'workhorse-passthrough' into 'master'
Pass all requests from NGINX to gitlab-workhorse



See merge request !2073
2015-12-16 13:40:20 +00:00
Dmitriy Zaporozhets a1fd87cddb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:37:04 +01:00
Douwe Maan e07c9c1ee1 Merge branch 'rs-clipboard-fixes' into 'master'
Fix clipboard buttons on MR instructions and Commit#show



See merge request !2108
2015-12-16 13:30:15 +00:00
Dmitriy Zaporozhets e65dfcf2b0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:29:13 +01:00
Achilleas Pipinellis 78be4fb21c Merge branch 'add_svn_2_git_docs' into 'master'
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
2015-12-16 13:24:36 +00:00
Dmitriy Zaporozhets a9d19fa8ef Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:24:32 +01:00
Douwe Maan 8e9f740d08 Merge branch 'rs-timeago' into 'master'
Fix time_ago_with_tooltip for activity feed

Closes #4002

See merge request !2074
2015-12-16 13:07:06 +00:00
Dmitriy Zaporozhets 259a7d7ba5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 13:45:14 +01:00
Dmitriy Zaporozhets 40104746d6 Merge remote-tracking branch 'origin/feature/update-rubocop' 2015-12-16 13:44:50 +01:00
Andrey 37a4e4945d Merge branch 'fix-profile-nav' into 'master'
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
2015-12-16 10:57:02 +00:00
Drew Blessing f98f353436 [ci skip] Add SVN to Git migration documentation 2015-12-15 16:29:07 -06:00
Robert Speicher f49ac5c8d3 Fix clipboard buttons on MR instructions and Commit#show 2015-12-15 16:11:01 -05:00
Robert Speicher a5a9cd304c Update CHANGELOG
[ci skip]
2015-12-15 15:55:28 -05:00
Robert Speicher 5ffed49fef Merge branch 'lazy-reference-extractor' into 'master'
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
2015-12-15 20:52:04 +00:00
Gabriel Mazetto 9072098215 Fixed CiServices validation 2015-12-15 17:37:23 -02:00
Robert Speicher 28a8d0b5db Merge branch 'add_user_repo_integrity_rake_task' into 'master'
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
2015-12-15 18:36:28 +00:00
Andrey 96a1558897 Merge branch 'wider-layout' into 'master'
Increase fixed layout width to 1280px

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @creamzy 

See merge request !2075
2015-12-15 18:19:55 +00:00
Dmitriy Zaporozhets ee258322f5 Merge branch 'fix-panel-height' into 'master'
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
2015-12-15 17:53:34 +00:00
Robert Speicher f2db1410f5 Update workhorse version in doc/install/installation.md 2015-12-15 12:21:53 -05:00
Douwe Maan f31dfae28a Fix inline panel heading height 2015-12-15 17:31:07 +01:00
Douwe Maan 6560d053ed Use lazy reference extractor to get issue's MRs 2015-12-15 16:57:11 +01:00
Job van der Voort ddd806c66f Revert "Make sure notify email always has author info."
This reverts commit 303f79f804.
2015-12-15 16:45:52 +01:00
Jacob Vosmaer 2c130aa087 Gitlab-workhorse related 8.3 update changes 2015-12-15 16:38:11 +01:00
Jacob Vosmaer d27befe64d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passthrough 2015-12-15 16:24:14 +01:00
Jacob Vosmaer 447e598ec4 Update init script options for gitlab-workhorse 2015-12-15 16:24:04 +01:00
Douwe Maan 48b3ad6d37 Banzai::XFilter -> Banzai::Filter::XFilter 2015-12-15 16:10:32 +01:00
Douwe Maan 7781bda9bd Move Markdown/reference logic from Gitlab::Markdown to Banzai 2015-12-15 15:51:16 +01:00
Grzegorz Bizon 4493d3fd55 Merge branch 'tests/note-polling' into 'master'
Add feature specs for note polling

Ref. #4032, !2084

cc @rspeicher 

See merge request !2086
2015-12-15 14:02:28 +00:00
Jacob Vosmaer 3581927f59 Require gitlab-workhorse 0.5.0 2015-12-15 14:30:00 +01:00
Grzegorz BizonandGrzegorz Bizon 8fe821cfa5 Trigger notes refresh in specs instead of waiting for ajax 2015-12-15 14:19:35 +01:00
Grzegorz BizonandGrzegorz Bizon 6fb120d1b0 Assign notes object to a variable 2015-12-15 14:19:35 +01:00
Grzegorz BizonandGrzegorz Bizon 3e789eab8b Add minor fixes in note polling specs 2015-12-15 14:19:35 +01:00
Grzegorz BizonandGrzegorz Bizon 9470d05c70 Add spinach test for note polling
This also increases capybara timeout to 15 seconds (note polling
interval). Capybara will look for new note for this period of time.
2015-12-15 14:19:35 +01:00
Grzegorz BizonandGrzegorz Bizon 7c14541d2b Add feature specs for note polling
Ref. #4032, !2084
2015-12-15 14:19:35 +01:00
Douwe Maan 9451db3819 Merge branch 'rs-issue-4032' into 'master'
Fix note polling

Closes #4032

See merge request !2084
2015-12-15 13:18:13 +00:00
Gabriel Mazetto f479ed3066 Disabled Rails/Date cop 2015-12-15 00:54:26 -02:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Robert Speicher 2b4a3bc524 Merge branch 'preserve-trailing-new-lines-at-eof' into 'master'
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
2015-12-14 23:29:50 +00:00
Achilleas Pipinellis f28c2de41f Merge branch 'contributing_md' into 'master'
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
2015-12-14 23:24:07 +00:00
Achilleas Pipinellis 1c7128f34c Fix links [ci skip] 2015-12-15 00:44:02 +02:00
Gabriel Mazetto d1f1c5c60b Updated .rubocop.yml to match 0.35.x changes 2015-12-14 20:27:43 -02:00
Achilleas Pipinellis 2e54428171 Clean up CONTRIBUTING.md [ci skip]
* Use 80 chars width where possible
* Remove easyfix label reference
* Add new issue submission template
* Add long links to the bottom of the page
2015-12-15 00:17:25 +02:00
Drew Blessing f8bf6c4b2c [ci skip] Add user repository integrity check rake task 2015-12-14 15:27:14 -06:00
Douglas Barbosa Alexandre 5afe03315d Preserve trailing new lines at the end of file on the online editor
Because Haml automatically indents the HTML source code, the contents
of whitespace-sensitive tags like pre and textarea can get screwed up.
2015-12-14 18:22:28 -02:00
Achilleas Pipinellis e7d7cd67bb Clarify what CE and EE means for newcomers 2015-12-14 22:07:53 +02:00
Achilleas Pipinellis b95f7b1864 Merge branch 'feature-proposal' into 'master'
update guides for feature proposals on the issue tracker

see also #4038 

cc @sytses 

See merge request !2094
2015-12-14 20:00:57 +00:00
Robert Schilling f7af7c993b Merge branch 'fix-typo-mailing-list' into 'master'
Fix Typo [mailinglist to mailing list]

Closes: #4078 

See merge request !2098
2015-12-14 19:49:51 +00:00
Mrinal 829dc1493c Fix Typo [mailinglist to mailing list] 2015-12-14 19:46:41 +00:00
Job van der Voort 5fb1fd27aa move up text regarding where to post issue 2015-12-14 20:22:06 +01:00