Commit Graph

32675 Commits

Author SHA1 Message Date
James Lopez 457adb942c prevent algorithm and key length issue for upgrades from an older GilLab version - 8.6 or earlier 2016-07-20 12:08:52 +02:00
Rémy Coutable ef2edcc100 Merge branch 'remove-parse-boolean' into 'master'
Replace parse_boolean with to_boolean

## What does this MR do?

Replaces `.parse_boolean` with the new `.to_boolean` as we talked in the other MR.

## Does this MR meet the acceptance criteria?

~~- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~

~~- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~

~~- [ ] API support added~~
- Tests

  ~~- [ ] Added for this feature/bug~~
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5355
2016-07-20 09:06:58 +00:00
Robert Schilling 839aec1a61 Replace parse_boolean with to_boolean 2016-07-20 08:55:44 +02:00
Stan Hu 79b02e40e5 Merge branch 'remove-csp-sentry-reporting' into 'master'
Fix the Sentry spam from CSP violations by disabling it.

## What does this MR do?

Leaves CSP enabled, but without a reporting endpoint for now. This was causing a huge amount of useless errors in our Sentry instance.

cc: @stanhu 

See merge request !5354
2016-07-20 05:05:48 +00:00
Connor Shea 38577d6825
Fix the Sentry spam from CSP violations by disabling it. 2016-07-19 22:29:15 -06:00
Jacob Schatz f2cd21e894 Merge branch 'wiki-gfm-autocomplete' into 'master'
Fixed GFM autocomplete not loading on wiki pages

## What does this MR do?

Allows the GFM autocomplete to work on wiki pages.

## What are the relevant issue numbers?

Closes #19580 

See merge request !5132
2016-07-20 01:30:16 +00:00
Kamil Trzciński b9ed9d658a Merge branch '19937-fix-wrong-build-elapsed-time' into 'master'
Fix build duration when build is not finished yet

## What does this MR do?

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

## Why was this MR needed?

## What are the relevant issue numbers?

Fixes #19937.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG since it fixes a regression not yet in a stable release (I think)
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5323
2016-07-19 20:55:32 +00:00
Douwe Maan b5cd34cc0a Merge branch 'fix/limit-rev-list-count-to-one' into 'master'
Limit git rev-list output count to one in forced push check

## What does this MR do?
It adds `--max-count=1` to the git command used to check for forced push, this way we can have a brief yet indicative output, saving some time used to split the string returned.

Credits go to @pacoguzman for pointing me to the command option.

## Are there points in the code the reviewer needs to double check?
Don't think so.

## Why was this MR needed?
It could allow for faster check of forced pushes.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/14280#note_13177575

## Screenshots (if relevant)
N/A

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- ~~Tests~~
  - [ ] ~~Added for this feature/bug~~
  - [ ] ~~All builds are passing~~
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] ~~[Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)~~

See merge request !5352
2016-07-19 20:18:49 +00:00
Douwe Maan dbcccd783a Merge branch 'rs-issue-19878' into 'master'
Ensure Owners are included in the scope for authorized_projects

Prior, when providing a `min_access_level` parameter to this method, we
called `Gitlab::Access.values` instead of `all_values`, mistakenly
omitting the `OWNER` level.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878

See merge request !5353
2016-07-19 20:05:27 +00:00
Ahmad Sherif 41b25e5a0d Limit git rev-list output count to one in forced push check 2016-07-19 21:22:58 +02:00
Robert Speicher 17bac49154 Ensure Owners are included in the scope for authorized_projects
Prior, when providing a `min_access_level` parameter to this method, we
called `Gitlab::Access.values` instead of `all_values`, mistakenly
omitting the `OWNER` level.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878
2016-07-19 13:19:04 -06:00
Jacob Schatz b269a6d5a9 Merge branch '19847-running-icon' into 'master'
Add new CI status icons

## What does this MR do?
Adds new CI status icons for every state

## What are the relevant issue numbers?
Closes #19847 

## Screenshots (if relevant)
![Screen_Shot_2016-07-19_at_6.58.37_AM](/uploads/ec391b59825f5a4a228d7c77e7485b1e/Screen_Shot_2016-07-19_at_6.58.37_AM.png)


See merge request !5280
2016-07-19 18:54:05 +00:00
Stan Hu 4915105cab Merge branch 'feature/rouge-2.0.4' into 'master'
upgrade rouge to 2.0.5

## What does this MR do?
Upgrades Rouge to 2.0.5

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

## Why was this MR needed?
New lexers and bugfixes from upstream.

## What are the relevant issue numbers?

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5351
2016-07-19 18:50:33 +00:00
Jacob Schatz 16f60fc74f Merge branch 'clipboard-button' into 'master'
Remove white background on clipboard button; position icon

## What does this MR do?
Removes white background from clipboard button

## What are the relevant issue numbers?
Closes #19098 

## Screenshots (if relevant)
![Screen_Shot_2016-07-18_at_3.12.24_PM](/uploads/4a6a540e1a074e6cf89fb99be1b49f2d/Screen_Shot_2016-07-18_at_3.12.24_PM.png)
![Screen_Shot_2016-07-18_at_8.50.55_PM](/uploads/8c594b6f9a74095b194fe1f634eaf226/Screen_Shot_2016-07-18_at_8.50.55_PM.png)

See merge request !5335
2016-07-19 18:35:41 +00:00
Jacob Schatz f4505757cf Merge branch 'tag-page-updates' into 'master'
Fix styling of tag page

## What does this MR do?
Fixes tag page UI

## Screenshots (if relevant)
Before:    
![Screen_Shot_2016-07-18_at_3.09.28_PM](/uploads/575776fe7917321307baf2b8c2b34d75/Screen_Shot_2016-07-18_at_3.09.28_PM.png)
After:    
![Screen_Shot_2016-07-18_at_3.09.08_PM](/uploads/44f905318c01eb094989cb74bcd4c3c1/Screen_Shot_2016-07-18_at_3.09.08_PM.png)

See merge request !5334
2016-07-19 18:35:01 +00:00
Jacob Schatz c263c84ae4 Merge branch 'fork-icon' into 'master'
New fork icon!

## What does this MR do?
We are using the old fork icon for branching only, so this implements our new custom fork icon

## Screenshots (if relevant)
![Screen_Shot_2016-07-15_at_9.22.33_AM](/uploads/05abaffff314e41f582189327bcca6b2/Screen_Shot_2016-07-15_at_9.22.33_AM.png)     
![Screen_Shot_2016-07-15_at_9.29.14_AM](/uploads/a08c622c92da00945406bbd4b3497749/Screen_Shot_2016-07-15_at_9.29.14_AM.png)

cc @hazelyang 

See merge request !5276
2016-07-19 18:33:53 +00:00
Annabel Dunstone 2a092da35c Fix alignment of icons on project page 2016-07-19 11:14:23 -07:00
Annabel Dunstone 21096189a5 Fix ci_status_helper_spec to look for new SVGs 2016-07-19 11:11:52 -07:00
Dmitriy Zaporozhets 1d7ac1641e Merge branch 'fix-help-paths' into 'master'
Fix help page paths to make sure shortcuts and the UI help page work.

Add a test to make sure the help page UI path doesn't break in the future.

Fixes #19972 and #19889.

cc: @dzaporozhets @rspeicher @lbennett 

See merge request !5350
2016-07-19 17:57:00 +00:00
http://jneen.net/ 5b124fc328 use 2.0.5, actually (2.0.4 was a bad release) 2016-07-19 10:37:55 -07:00
http://jneen.net/ 764924b6a9 upgrade rouge to 2.0.4 2016-07-19 10:28:48 -07:00
Connor Shea 16a8160e9f
Fix help page paths to make sure shortcuts and the UI help page work.
Add a test to make sure the help page UI path doesn't break in the future.

Fix #19972 and #19889.
2016-07-19 11:17:14 -06:00
Douwe Maan 81e57e783e Merge branch 'rename-repo-files' into 'master'
Implements the form for renaming the new filename on the file edit page

## What does this MR do?
Adds the possibility to edit a filename when editing the content of a file on Gitlab

this MR was made to solve #5850 

![Screen_Shot_2016-07-01_at_16.45.53](/uploads/eeed05800e3dc11f1e3840e0e4fa06b5/Screen_Shot_2016-07-01_at_16.45.53.png)

See merge request !5049
2016-07-19 15:37:39 +00:00
Rémy Coutable e953b8afd2 Merge branch 'allow-deploy-key-to-download-public-projects' into 'master'
Allow to pull code with deploy key from public projects

## What does this MR do?
With deploy keys you can download any public projects stored in GitLab.

## What are the relevant issue numbers?
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/1217

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5316
2016-07-19 15:21:29 +00:00
Rémy Coutable 0e9323bd4a Merge branch 'fix/import-export-project-avatar' into 'master'
Project avatar import/export functionality

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19851

Adds logic to export and import a project avatar

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5273
2016-07-19 14:32:40 +00:00
tiagonbotelho ff05936058 fixes an issue cause by a bad merge 2016-07-19 15:27:29 +01:00
Annabel Dunstone 293d31ca87 Vertically align status icon within table 2016-07-19 06:52:06 -07:00
Annabel Dunstone 0301fa8d9c Add new icons for every CI status 2016-07-19 06:47:26 -07:00
Rémy Coutable 6593e3cef8 Merge branch 'fix-retries-on-old-builds' into 'master'
Use value of `yaml_variables` and `when` from config_processor if undefined

## What does this MR do?
Uses `yaml_variables` and `when` from config_processor if values for these are undefined.

## Why was this MR needed?
Old builds doesn't have this columns initialised. 
Thus makes the retries on these builds to not work properly.
This is regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5296.

## Does this MR meet the acceptance criteria?

- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)


See merge request !5342
2016-07-19 13:42:47 +00:00
Fatih Acet e57c0c89f0 Merge branch 'note-form-login-link-referer' into 'master'
Added redirect_to_referer to login link on issues

## What does this MR do?

Adds a `redirect_to_referer` param to login & register links on issues when not logged in. This makes the login box redirect back to the issue after login.

## What are the relevant issue numbers?

Closes #19968 

See merge request !5344
2016-07-19 13:12:33 +00:00
Annabel Dunstone 5b5cafe024 Add global style for running icon 2016-07-19 06:04:04 -07:00
Annabel Dunstone 068f2f4f16 Align running icon in merge request 2016-07-19 06:03:22 -07:00
Annabel Dunstone da55496b6f Add new running icon; add a bunch of styles to get svg to match existing fa icons 2016-07-19 06:03:22 -07:00
Kamil Trzcinski 6b07a5b26c Improve code design 2016-07-19 14:58:17 +02:00
Kamil Trzcinski 276d28a60f Fix broken builds_for_ref 2016-07-19 14:54:18 +02:00
Kamil Trzcinski 6208c24d1f Move when tests before to make it no conflict with manual-actions 2016-07-19 14:54:18 +02:00
Kamil Trzcinski 41fa516bb6 Use value of `yaml_variables` and `when` from config_processor if undefined 2016-07-19 14:53:35 +02:00
Rémy Coutable 61e7453e04 Merge branch 'manual-actions' into 'master'
Add support for manual CI actions

## What does this MR do?
This implements a `when: manual` which allows a jobs to be marked as manual actions.
Manual actions have to be explicitly executed by developers.

## What are the relevant issue numbers?
This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010

See merge request !5297
2016-07-19 12:49:54 +00:00
Rémy Coutable ad14c1bf85 Merge branch 'api-cleanup-entities' into 'master'
Simplify entities for branches and tags API

## What does this MR do?

As talked in !5208, I improved the entity for branches and tags.

## Does this MR meet the acceptance criteria?

~~- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
~~- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
~~- [ ] API support added~~
~~- Tests~~
  ~~- [ ] Added for this feature/bug~~
  ~~- [ ] All builds are passing~~
~~- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)~~
~~- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)~~
~~- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)~~

See merge request !5343
2016-07-19 12:48:17 +00:00
Fatih Acet 72cc43df1c Merge branch '19751-branch-tag-icons' into 'master'
Resolve "Add icons for branch and tag in pipeline list"

## What does this MR do?
Adds branch or tag icon on pipeline ref

## What are the relevant issue numbers?
Closes #19751    
Part of #18920 

## Screenshots (if relevant)
![Screen_Shot_2016-07-13_at_1.42.54_PM](/uploads/d90706a76cf87a6cc8c25dca9a71affa/Screen_Shot_2016-07-13_at_1.42.54_PM.png)

With icons closer to tag/branch name/sha:   
![Screen_Shot_2016-07-15_at_11.23.48_AM](/uploads/411338f811bafbd314dbab5553fa46d4/Screen_Shot_2016-07-15_at_11.23.48_AM.png)

See merge request !5239
2016-07-19 12:47:09 +00:00
Kamil Trzcinski 72229c375f Add CHANGELOG entry [ci skip] 2016-07-19 14:43:45 +02:00
Phil Hughes c7fcd061f5 CHANGELOG item 2016-07-19 13:35:23 +01:00
Rémy Coutable 1e81ab7c8c Merge branch 'deployment-tracking' into 'master'
Added Rake task for tracking deployments

## What does this MR do?

This MR adds a Rake task to track the current version of GitLab in InfluxDB.

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

We may want to document this Rake task in some Markdown file, but I'm not sure what the best place for this would be.

## Why was this MR needed?

We want to have a more accurate overview of when deployments occurred. 

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/infrastructure/issues/98

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] ~~API support added~~
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5320
2016-07-19 12:33:45 +00:00
James Lopez f85b78c1e9 fix spec 2016-07-19 14:31:22 +02:00
Phil Hughes d705537634 Added redirect_to_referer to login link on issues
Closes #19968
2016-07-19 13:27:11 +01:00
Rémy Coutable 4db94cb9d7 Merge branch 'api-delete-todos' into 'master'
Api delete todos

## What does this MR do?

It changes the `DELETE /todos` to only return the number of marked todos.

## Why was this MR needed?

Before it returned the marked todos as an paginated array. Since we deleted/marked the todos, there was no way to get the rest of the todos.

## What are the relevant issue numbers?

Closes #19678

## Does this MR meet the acceptance criteria?

~~- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5341
2016-07-19 12:16:15 +00:00
Robert Schilling 3413f6fa50 Simplify entities for branches and tags API 2016-07-19 13:41:32 +02:00
Yorick Peterse 499cdf1d19
Added Rake task for tracking deployments
This simply inserts the current GitLab version in the "deployments"
measurement.

Fixes gitlab-com/infrastructure#98
2016-07-19 13:21:09 +02:00
Dmitriy Zaporozhets 1cd573ee7f Merge branch 'new-issue-bg-color' into 'master'
Change color of today issue highlight



See merge request !5329
2016-07-19 11:12:21 +00:00
Robert Schilling baa9ce8480 Return the number of marked todos 2016-07-19 13:09:57 +02:00