Commit Graph
8955 Commits
Author SHA1 Message Date
Ben Bodenmiller fb1cd0a842 fix stuck MR
fixes #348. related to 6487419364.
2015-04-14 00:15:34 -07:00
Hannes Rosenögger 63f0f6f315 Merge branch 'empty-avatar-alt-text' into 'master'
Explicitly set image alt to prevent graphical glitches

Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded.

Fixes https://github.com/gitlabhq/gitlabhq/issues/6036.

Signed-off-by: Sven Strickroth <email@cs-ware.de>

See merge request !503
2015-04-13 19:13:09 +00:00
Sven Strickroth 57c2a9f03d Explicitly set image alt to prevent graphical glitches
Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded.

Fixes https://github.com/gitlabhq/gitlabhq/issues/6036.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-04-13 21:07:42 +02:00
Hannes Rosenögger de825b54d4 Merge branch 'remove-sidebar-help-link' into 'master'
Removed help link from sidebar

Closes #1349

I don't see the point in having two links on the page that will do the same thing.

See merge request !483
2015-04-13 19:04:22 +00:00
Dmitriy Zaporozhets 4ab717ea6a Merge branch 'ldap_migration'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
2015-04-13 17:18:02 +03:00
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master'
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
2015-04-13 14:10:25 +00:00
Dmitriy Zaporozhets 6e88d9335b Merge branch 'skip-email-reconfirmation' into 'master'
Skip email confirmation when set by admin or via LDAP.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203.

See merge request !494
2015-04-13 13:44:56 +00:00
Dmitriy Zaporozhets 3092e7f86a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-13 15:52:07 +03:00
Dmitriy Zaporozhets c543cd1ed3 Fix performance issue when browse big diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-13 15:51:28 +03:00
Hannes Rosenögger 8e9fbd847d Revert "Merge branch 'fix_email_images' into 'master'"
This reverts commit d66148ef39, reversing
changes made to cdb64a81a8.

This change needed to be reverted,
because not enough email clients support inline images.
2015-04-13 12:34:47 +02:00
Dmitriy Zaporozhets 9e848bcd5a Merge pull request #9104 from jdsn/fix-issue9098-clean_path
Fix issue9098 clean path
2015-04-13 12:17:35 +03:00
Dmitriy Zaporozhets 9c14ed0689 Merge branch 'public-deploy-keys' into 'master'
Allow admin to create public deploy keys that are accessible to any project.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774.

Project settings:

![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png)

The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.

The list of projects below the public key has been changed to only show projects the user has access to.

"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.

Admin index:

![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png)

Admin detail page:

![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png)

Projects using the deploy key are listed on the left and can be disabled easily.

See merge request !469
2015-04-13 09:08:13 +00:00
Dmitriy Zaporozhets 0c24192fb1 Merge branch 'fix-group-project-list-cache' into 'master'
Bust group page project list cache when namespace name or path changes.

Fixes gitlab-com/support-forum#144.

See merge request !509
2015-04-13 09:01:03 +00:00
Robert Speicher cd590bf1f4 Use start_with? instead of String slicing to check for external links
[ci skip]
2015-04-12 18:04:50 -04:00
Robert Speicher 975f1e6ec8 Speed up the overridden link_to helper
Only bothers to check the provided link's external status if it's a
String that doesn't begin with a path or anchor character.
2015-04-12 17:48:28 -04:00
Dmitriy Zaporozhets 8d9d63b250 Merge branch 'arbitrary-local-repo-import' into 'master'
Prevent arbitary local repos from being imported.

Fixes gitlab/gitlab-ee#263.

See merge request !1763
2015-04-12 10:21:15 +00:00
Dmitriy Zaporozhets 73269a0a3a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-12 12:54:48 +03:00
Dmitriy Zaporozhets f244914402 Merge branch 'regex-start-of-string' into 'master'
Fix persistent XSS vulnerability around profile website URLs.

Fixes gitlab/gitlab-ee#268

See merge request !1761
2015-04-12 07:36:40 +00:00
Dmitriy Zaporozhets 9df1476305 Merge branch 'rs-issue-1942' into 'master'
Upon successful login, clear `reset_password_token` field

Closes #1942

See merge request !1757
2015-04-12 07:33:06 +00:00
Stan Hu 8ce69bdc8e Fix typo 2015-04-11 21:13:14 -07:00
Robert Speicher 307962a046 Rename last uses of Buildbox to Buildkite 2015-04-11 14:05:22 -04:00
Robert Speicher 93b1767799 Move buildbox_service files to buildkite_service 2015-04-11 14:05:22 -04:00
Robert Speicher 4077f66beb Sort available_services_names array alphabetically 2015-04-11 14:05:22 -04:00
Valery Sizov 8666f497ff fix ldap identities 2015-04-11 17:56:45 +03:00
Douwe Maan 9e52a2dcab Don't use URI.regexp to validate since it doens't have start/end anchors. 2015-04-11 11:38:14 +02:00
Douwe Maan cebb74a0c0 Fix project import URL regex to prevent arbitary local repos from being imported. 2015-04-11 11:37:58 +02: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
Douwe Maan abc06c2531 Don't leak existence of group or project via search. 2015-04-10 18:40:39 +02:00
Douwe Maan 1f813024ba Don't leak existence of project via search autocomplete. 2015-04-10 18:40:39 +02:00
Dmitriy Zaporozhets 705e43bf04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-10 19:39:11 +03:00
Douwe Maan 0ece6bd828 Use \A and \z in regexes instead of ^ and $. 2015-04-10 18:31:07 +02:00
Douwe Maan 6cf7dd625a Fix persistent XSS vulnerability around profile website URLs. 2015-04-10 18:30:49 +02:00
Douwe Maan edd05fc48c Fix directory traversal vulnerability around help pages. 2015-04-10 18:18:37 +02:00
Douwe Maan 562a9b1a87 Bust group page project list cache when namespace name or path changes. 2015-04-10 16:10:25 +02: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 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
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
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
Robert Speicher 57afaf9d92 Upon successful login, clear reset_password_token field
Closes #1942
2015-04-08 16:06:56 -04: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
J. Daniel Schmidt d03cec0e69 clean_path should drop all leading dashes, not just one 2015-04-08 15:54:27 +02:00
J. Daniel Schmidt 706be56317 clean_path should drop all trailing dots, not just one 2015-04-08 15:54:21 +02: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 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
J. Daniel Schmidt 2794e57beb clean_path should not drop the last character
Fixes https://github.com/gitlabhq/gitlabhq/issues/9098
2015-04-08 10:51:36 +02:00