Commit Graph
15414 Commits
Author SHA1 Message Date
Robert Schilling 52db4e8a98 Merge branch 'fix-typo-starred-projects' into 'master'
Fix typo

See merge request !511
2015-04-12 07:21:43 +00:00
Stan Hu 8ce69bdc8e Fix typo 2015-04-11 21:13:14 -07:00
Douwe Maan 940150dc9a Merge branch 'bump-gitlab-shell' into 'master'
Bump gitlab-shell

Fix git over ssh errors 'fatal: protocol error: bad line length character'

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

cc @DouweM @patricio

See merge request !506
2015-04-11 09:19:25 +00:00
Dmitriy Zaporozhets 5155b9794d Merge pull request #9076 from dsander/event-title-width
Fix event-title max-width in the dashboard
2015-04-10 21:29:52 +03:00
Dmitriy Zaporozhets 0d881c7873 Merge pull request #9114 from dreis2211/dreis2211-patch-1
Include creator_id in project info of API
2015-04-10 21:29:10 +03:00
Christoph Dreis d570d0a280 Update API documentation of projects with creator_id 2015-04-10 20:05:01 +02:00
Dmitriy Zaporozhets 705e43bf04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-10 19:39:11 +03:00
Christoph Dreis 1fdc610fa5 Include creator_id in project info of API 2015-04-10 18:35:05 +02:00
Dmitriy Zaporozhets 24d139ba97 Merge branch 'rs-revert-preload-lib' into 'master'
Revert "Preload lib/"

This reverts commit 5511a731bc.

The original commit added this because it also enabled threadsafety, a change which was itself later reverted in 66d6c80966, but this got left behind.

I don't fully understand the reasoning behind it so if I'm wrong, please tell me.

My reasoning for reverting it is that it messes with Rails' (and by extension Spring's) class reloading during development. When I was working in `lib/gitlab/markdown` and had to stop and restart the server every time I made a change, I didn't know it at the time, but this was why. That was a huge pain point.

If it's needed for production perhaps we could add a `if Rails.env.production?` clause around it so that it doesn't mess with development.

See merge request !1758
2015-04-10 14:34:57 +00:00
Dmitriy Zaporozhets 256d2ae700 Merge branch 'rs-issue-2211' into 'master'
Update redcarpet to 3.2.3

Closes #2211

See merge request !1756
2015-04-10 12:39:11 +00:00
Douwe Maan 6331759735 Merge branch 'fix-submodules-with-relative-links' into 'master'
Fix broken file browsing with a submodule that has a relative link

## What does this MR do?

This MR fixes an error that occurs when browsing a submodule with a relative link.

### Are there points in the code the reviewer needs to double check?

I re-wrote the function because I was confused by how the first one was supposed to work. Please review if it's clearer.

### Why was this MR needed?

A 500 Error would occur when using the file browser on a repo with a submodule. Here's how to reproduce the bug:

1. Start a new project in GitLab.
2. Clone git://git.gniibe.org/gnuk/gnuk.git/ locally.
3. Push repo to new project.
4. Click on "Files" in the project.

The .gitmodules file:
```
[submodule "chopstx"]
        path = chopstx
        url = ../../chopstx/chopstx.git
```
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

1. #775
2. #1385
3. https://github.com/gitlabhq/gitlabhq/issues/8153
4. https://github.com/gitlabhq/gitlabhq/issues/8881
5. https://github.com/gitlabhq/gitlabhq/issues/7554

See merge request !508
2015-04-10 11:51:24 +00:00
Douwe Maan 149195eded Merge branch 'current-user-to-top-filter' into 'master'
Move current user to the top of the list in author/assignee filter

### What does this MR do?

This MR puts the current user at the top of the user list in the author/assignee filters.

### Are there points in the code the reviewer needs to double check?

Is it best to do this in the JavaScript as it is in this MR, or are we better off adding an argument to the `/users` API to put the current user on top?

Also, I elected to put the current user after "Any" and "Unassigned"--it looked better. Do you agree?

### Why was this MR needed?

If you're trying to look for "Me" in the list, often you have to scroll down a long way to find yourself. Using the filter to find yourself is yet another step requiring the keyboard, and it's easy to forget that feature is available.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1321 and #1396

### Screenshots

Before:

![Screen_Shot_2015-04-08_at_11.18.44_PM](https://gitlab.com/stanhu/gitlab-ce/uploads/4c28ae5a3a51a8329c806ecfbc549071/Screen_Shot_2015-04-08_at_11.18.44_PM.png)

After:

![Screen_Shot_2015-04-08_at_11.20.06_PM](https://gitlab.com/stanhu/gitlab-ce/uploads/ff3b8bdf38467236edbcc29401cd1235/Screen_Shot_2015-04-08_at_11.20.06_PM.png)

See merge request !505
2015-04-10 11:44:10 +00:00
Stan Hu 7d089701f1 Fix broken file browsing with a submodule that has a relative link
Closes #775
2015-04-09 22:10:59 -07:00
Robert Speicher 5a0ff2f52f Be more explicit about which "Markdown" ReferenceExtractor includes 2015-04-09 17:28:46 -04:00
Robert Speicher 13313d9e31 Disable RedCarpet's escape_html option
This option defaults to true in RedCarpet 3.2.0, but we handle
sanitization later in the process with html-pipeline.

Closes #2211
2015-04-09 17:28:45 -04:00
Robert Speicher b142d449c6 Update redcarpet to 3.2.3 2015-04-09 17:28:45 -04:00
Robert Speicher c9a1634f31 Move lib/gitlab/contributors to its correct path 2015-04-09 15:34:55 -04:00
Robert Speicher abae9b8d63 Add autoloads for lib/gitlab/satellite/files/*
These files don't match their naming convention, but for organizational
purposes it makes sense.
2015-04-09 14:19:25 -04:00
Robert Speicher 91c39fd8c7 Add lib/gitlab.rb to autoload non-conventional paths 2015-04-09 14:19:25 -04:00
Robert Speicher 2cefdbb535 Move lib/gitlab/oauth to lib/gitlab/o_auth
Lets Rails autoload these files by name
2015-04-09 14:19:24 -04:00
Robert Speicher a3601d6005 Revert "Preload lib/"
This reverts commit 5511a731bc.
2015-04-09 12:21:59 -04:00
Dmitriy Zaporozhets 1ff40a7946 Merge branch 'ci_fork' into 'master'
Project fork on CI side

https://dev.gitlab.org/gitlab/gitlab-ci/issues/187

!!! GitLab CI side MR - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/56

See merge request !499
2015-04-09 13:41:37 +00:00
Valery Sizov e28bc41f76 update changelog 2015-04-09 13:53:08 +03:00
Dmitriy Zaporozhets eabbcf4ea8 Bump gitlab-shell
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-09 13:31:44 +03:00
Stan Hu 3d2c387840 Move current user to the top of the list in author/assignee filters
Closes #1321
2015-04-09 01:04:53 -07:00
Patricio Cano 6848312f37 Corrected title of forking workflow on the README link. 2015-04-08 16:31:27 -05:00
Douwe Maan f3f856029b Merge branch 'fix-slashes-in-wiki-urls' into 'master'
Fix bug where Wiki pages that include a '/' were no longer accessible

### What does this MR do?

This MR fixes a regression that caused Wiki pages that included a '/' to no longer be accessible.

### Are there points in the code the reviewer needs to double check?

Are there cases that `wiki_helper.rb` doesn't handle?

### Why was this MR needed?

The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a model ID to be escaped automatically. We can no longer use the built-in the URL helpers to generate the links for Wiki pages if we want to maintain support for slashes. There is no option to tell the formatter otherwise:

http://stackoverflow.com/questions/25031791/rails-4-1-2-to-param-escapes-slashes-and-breaks-app

The Rails code in question is here:

https://github.com/rails/rails/blob/4-1-stable/actionpack/lib/action_dispatch/journey/visitors.rb#L159

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1363

See merge request !502
2015-04-08 16:30:23 +00:00
Dmitriy Zaporozhets a381ecbdbc Merge branch 'project-file-tabs' into 'master'
Move project file links to tab bar.

The sidebar was getting awfully crowded, so I moved the file links to the tab bar alongside Activity and Readme. Unlike Readme, these files are not actually loaded in a tab, but simply link to the relevant blob, because we don't want to unnecessarily load the potentially large changelog or contribution guide on every project page load.

![Screen_Shot_2015-04-06_at_15.04.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/962e8073ab6dc8797f93ee754eb275ed/Screen_Shot_2015-04-06_at_15.04.21.png)

See merge request !497
2015-04-08 13:10:52 +00:00
Dmitriy Zaporozhets e86e101370 Merge branch 'bump_all_versions' into 'master'
Corrected steps for creating a patch release

Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it

See merge request !1754
2015-04-08 11:16:44 +00:00
Dmitriy Zaporozhets a4ff127728 Merge branch 'rs-application-form-messages' into 'master'
Make the "New Application" form's error messages visible

Prior, if you submit the form without values the error text and the form fields were white-on-white:

![Screen_Shot_2015-04-01_at_8.25.56_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/17eb44e65fc9c5ddd4a529e3927cd9b6/Screen_Shot_2015-04-01_at_8.25.56_PM.png)

After:

![Screen_Shot_2015-04-06_at_10.13.07_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/be53d6971ec1c34f415e75a0307b6577/Screen_Shot_2015-04-06_at_10.13.07_PM.png)

See merge request !1752
2015-04-08 11:14:08 +00:00
Dmitriy Zaporozhets 4902dca966 Merge branch 'rs-issue-2152' into 'master'
Render a 404 when RefsController#logs_tree gets an HTML request

Fixes #2152

See merge request !1748
2015-04-08 11:11:38 +00:00
Dmitriy Zaporozhets 584fa0bdca Merge branch 'rs-signup-box-text' into 'master'
Improve wording below signup box

Before:

![Screen_Shot_2015-04-07_at_5.46.31_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a5433c7c423fd37cffe4c2352a833dcf/Screen_Shot_2015-04-07_at_5.46.31_PM.png)

After:

![Screen_Shot_2015-04-07_at_5.45.05_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/46e13756a8dc389e6f87de0097433e36/Screen_Shot_2015-04-07_at_5.45.05_PM.png)

See merge request !1755
2015-04-08 11:10:41 +00:00
Dmitriy Zaporozhets 7b00721bb9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-08 14:10:08 +03:00
Dmitriy Zaporozhets 041ce7b303 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-08 14:09:58 +03:00
Dmitriy Zaporozhets 49ca05f4de Merge branch 'rs-shortcuts-typo' into 'master'
Typo -- findAndollowLink -> findAndFollowLink

Pushed here to get working CI.

See merge request !1750
2015-04-08 11:08:30 +00:00
Jeroen van Baarsen 4cf25eea3a Merge pull request #8546 from h0ru5/patch-1
add necessary dir for uploads in update to 6.7
2015-04-08 10:07:17 +02:00
Patricio Cano 3769e41ad8 Corrected title of forking workflow 2015-04-07 19:37:56 -05:00
Sytse Sijbrandij 4b2aa9cd20 Merge branch 'forking-doc' into 'master'
Documentation on how to fork a project

Added documentation on how to fork a project.

/cc @sabba

See merge request !1623
2015-04-08 00:34:32 +00:00
Patricio Cano a332e7bd02 Implemented changes suggested by Job. 2015-04-07 19:27:04 -05:00
Robert Speicher 8714038410 Improve wording below signup box
[ci skip]
2015-04-07 17:46:00 -04:00
Patricio Cano 56a19b8043 Added step to bump all versions (CE, EE, CI) every time there is a patch release and the reasoning behind it 2015-04-07 15:24:15 -05:00
Patricio Cano 45c82b3845 Added 7.9.3 to CHANGELOG 2015-04-07 13:18:37 -05:00
Robert Speicher b9069f31b9 Make the New Application form's error messages visible 2015-04-07 13:01:30 -04:00
Stan Hu 3143edfea6 Fix bug where Wiki pages that include a '/' were no longer accessible
Closes #1363
2015-04-07 09:10:11 -07:00
Robert Speicher f7190e428f Typo -- findAndollowLink -> findAndFollowLink 2015-04-07 11:03:48 -04:00
Dmitriy Zaporozhets 7d57d8b783 Merge branch 'rs-issue-2088' into 'master'
Lower the pointHitDetectionRadius for commit charts

Needed to update the Chart.js dependency as well.

Fixes #2088

See merge request !1749
2015-04-07 10:07:52 +00:00
Dmitriy Zaporozhets 7feec5fe05 Merge branch 'add-menu-icons' into 'master'
Add icons to Add dropdown items.

Before:

![Screen_Shot_2015-04-06_at_15.15.44](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a9f7d2e5dbd604fe7dff03cd7e47860e/Screen_Shot_2015-04-06_at_15.15.44.png)

After:

![Screen_Shot_2015-04-06_at_15.15.34](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c5be6cdbe32d1064da7497a1879a9eb3/Screen_Shot_2015-04-06_at_15.15.34.png)

See merge request !498
2015-04-07 09:55:48 +00:00
Dmitriy Zaporozhets 18dfe0ce76 Merge branch 'emailsonpush-last-line' into 'master'
Fix final line in EmailsOnPush email diff being rendered as error.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194.

Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18.

See merge request !480
2015-04-07 09:54:23 +00:00
Dmitriy Zaporozhets d21d5d2d72 Merge branch 'import-event' into 'master'
Add event to activity feed for imported projects.

![Screen_Shot_2015-04-06_at_14.51.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/07fd16cb558873d2a6fb6c3cfcfdb227/Screen_Shot_2015-04-06_at_14.51.16.png)

See merge request !496
2015-04-07 09:46:11 +00:00
Robert Speicher 5cc11cfcab Lower the pointHitDetectionRadius for commit charts
Fixes #2088
2015-04-07 00:37:05 -04:00