Commit Graph
31704 Commits
Author SHA1 Message Date
Douwe Maan 6ce25e7b4c Rename MergeRequest methods that return commits or shas to be more clear and consistent 2016-07-06 18:50:58 -04:00
Douwe Maan 18a5bb0520 Store diff head and start commit shas on MR diffs 2016-07-06 18:49:03 -04:00
Jacob Schatz c66a7b0e94 Merge branch 'build-auto-refresh' into 'master'
Fixed issue with build auto-refresh not working

## What does this MR do?

Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that.

See merge request !5110
2016-07-06 21:04:27 +00:00
Jacob Schatz e33b215ee3 Merge branch '18283-pluralize-stage-headings' into 'master'
Get rid of pluralize on stage names

## What does this MR do?
Removes `pluralize` from stage names

## What are the relevant issue numbers?
Closes #18283   
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920

## Screenshots (if relevant)
![Screen_Shot_2016-07-06_at_11.11.39_AM](/uploads/b1b2dd00dc8aacc6dff40cab1fe1ecdd/Screen_Shot_2016-07-06_at_11.11.39_AM.png)

cc @ayufan 


See merge request !5117
2016-07-06 21:02:40 +00:00
Jacob Schatz df174fa2d1 Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into 'master'
Added 100% width to open dropdown menus on mobile

## What does this MR do?

Sets dropdown-menus to be 100% width on small screens.

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

Do we want this on all dropdown menus or only dropdown menus activated by full-width buttons?
/cc @dzaporozhets 

## Why was this MR needed?

Mobile UX.

## What are the relevant issue numbers?

Closes #18858.

## Screenshots (if relevant)

![Screen_Shot_2016-06-22_at_00.14.09](/uploads/bd61721896bfac8af951374c2547acd6/Screen_Shot_2016-06-22_at_00.14.09.png)

## 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
- [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 !4844
2016-07-06 21:01:07 +00:00
Robert Speicher a77f9c521c Update CHANGELOG for 8.9.5
[ci skip]
2016-07-06 16:58:53 -04:00
Drew Blessing 7144867326 Merge branch 'fix_ldap_config' into 'master'
Fix erroneous YAML spacing in LDAP configuration

## What does this MR do?

Fix erroneous indentation in LDAP example configuration

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

Is the indentation correct now? 😂 

## Why was this MR needed?

Bad configs in docs suck.

See merge request !4326
2016-07-06 17:51:30 +00:00
Rémy Coutable 8e5bf15732 Merge branch 'gh-pull-requests' into 'master'
Fix importer for GitHub Pull Requests when a branch was reused across Pull Requests

Closes #17766

## What does this MR do?

GitHub importer fails when a repository has two Pull Requests, with the same branch name and different SHA, one of which was closed without merging, and one which is open or was merged in. This happens because we only checks if the branch exists in the [Gitlab::GithubImport::BranchFormatter#exists?](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/github_import/branch_formatter.rb#L6-8), before creating the missing references on Github. With this MR we check if both branch, and SHA exists in the current project. If no, we create the missing reference on GitHub before import the PR.

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

Nope.

## Why was this MR needed?

Github importer will fail if branch was reused across Pull Requests.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/19439

/cc @royaldark @thomasjachmann

See merge request !5103
2016-07-06 17:25:40 +00:00
Annabel Dunstone d90d51f99d Remove plural from pipelines_spec 2016-07-06 11:34:55 -05:00
Jacob Schatz 96684317aa Merge branch 'escape-to-cancel-note' into 'master'
Cancel creating or editing note by hitting Escape

/cc @rspeicher 

See merge request !5075
2016-07-06 16:31:26 +00:00
Robert Speicher 413484f2de Merge branch 'remove-lowercase-gitlab-ci-yml' into 'master'
Remove duplicate templates that are lowercase

See merge request !5114
2016-07-06 16:23:49 +00:00
Annabel Dunstone 47e5b5397e Get rid of pluralize on stage names 2016-07-06 11:09:28 -05:00
Douglas Barbosa Alexandre 075c899d82 Update CHANGELOG 2016-07-06 13:08:12 -03:00
Douglas Barbosa Alexandre 5f86a084f2 Consider that a GH exists only if both ref, and sha exist 2016-07-06 13:08:12 -03:00
Douglas Barbosa Alexandre 4e5de3e6ee Doesn't trigger Git hooks when cleaning up restored branches from GitHub 2016-07-06 13:08:12 -03:00
Douwe Maan 22780c4ac3 Merge branch '15094-throttling-pushes_since_gc' into 'master'
Throttle the update of `project.pushes_since_gc` to 1 minute

## What does this MR do?

Throttle the update of `project.pushes_since_gc` to alleviate DB load

## What are the relevant issue numbers?

Relates to #15094

## 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~~
  - [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 !5083
2016-07-06 15:53:04 +00:00
Rémy Coutable bb3801268b Fix specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-06 17:52:59 +02:00
Douwe Maan b5b17d00ed Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'master'
Fix diff comments not showing up in activity feed

## What does this MR do?

It fixes the detection of note events to check for `Note` and `LegacyDiffNote`.

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

No? /cc @DouweM (since I believe you introduced `LegacyDiffNote`

## Why was this MR needed?

To fix #19092.

## What are the relevant issue numbers?

Fixes #19092.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- 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 !5069
2016-07-06 15:25:54 +00:00
Douwe Maan 0742b65203 Merge branch 'shell-version-bump' into 'master'
Bump GITLAB_SHELL_VERSION to 3.2.0

Bump GITLAB_SHELL_VERSION to 3.2.0

Needed for !4696 to properly work.

Blocked by gitlab-org/gitlab-shell!62

See merge request !5101
2016-07-06 15:25:22 +00:00
Robert Speicher 3df58f1499 Merge branch 'gh-labels' into 'master'
Allow `?`, or `&` for label names

Closes #18727 

See merge request !4724
2016-07-06 15:11:20 +00:00
Robert Speicher be018ba8c4 Merge branch 'fix/import-url-validator' into 'master'
Fixing URL validation for import_url on projects

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

This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL.

It also adds a migration to fix current invalid `import_url`s

See merge request !4753
2016-07-06 15:06:01 +00:00
Rémy Coutable 14a8c514ef Remove duplicate templates that are lowercase
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-06 16:54:20 +02:00
Rémy Coutable 400f9f7223 Merge branch 'update-templates-for-8-10' into 'master'
Add and update .gitignore & .gitlab-ci.yml templates for 8.10



See merge request !5107
2016-07-06 14:26:27 +00:00
Rémy Coutable b73da89591 Merge branch 'fix/project-export-error' into 'master'
Add more debug info to import/export and memory killer

This should help debug https://gitlab.com/gitlab-org/gitlab-ce/issues/19124 further

See merge request !5108
2016-07-06 13:09:02 +00:00
Phil Hughes 2044af6ced Fixed issue with build auto-refresh not working 2016-07-06 10:16:16 +01:00
James Lopez 09452715d3 fix typo 2016-07-06 11:09:07 +02:00
James Lopez 95f630daeb even more debug 2016-07-06 10:29:31 +02:00
Rémy Coutable a91e4a9042 Add and update .gitignore & .gitlab-ci.yml templates for 8.10
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-06 10:17:31 +02:00
Rémy Coutable 19e15ae244 Use a more future-proof check for Note/LegacyDiffNote
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-06 10:08:42 +02:00
Douglas Barbosa Alexandre e89a515ce9 Fix unescaped strings in the labels dropdown template 2016-07-06 04:40:02 -03:00
Patricio Cano 4ea3d1785c Bump GITLAB_SHELL_VERSION to 3.2.0 2016-07-05 19:44:40 -05:00
Douglas Barbosa Alexandre 998d4eb61f Update CHANGELOG 2016-07-05 20:59:33 -03:00
Douglas Barbosa Alexandre e87ed41876 Render label name contains ?, & in the labels dropdown without escaping 2016-07-05 20:59:33 -03:00
Douglas Barbosa Alexandre 5d11cf2e98 Use CGI.unescapeHTML rather than doing the gsub with a map 2016-07-05 20:57:09 -03:00
Douglas Barbosa Alexandre d6b60e83ed Move unescape_html_entities from LabelsHelper to Label model 2016-07-05 20:57:09 -03:00
Douglas Barbosa Alexandre ab811b6ab9 Render references for labels that name contains ?, or & 2016-07-05 20:57:09 -03:00
Douglas Barbosa Alexandre e186626d25 Allow '?', or '&' for label titles 2016-07-05 20:57:09 -03:00
Douwe Maan cfd5870b62 Merge branch 'allow-disabling-of-git-access-protocol' into 'master'
Add setting that allows admins to choose which Git access protocols are enabled.

## What does this MR do?

It allows admins to disable one of the two protocols for Git access. They can choose to enable just SSH, HTTP or allow both. If one of them is disabled, the clone URL in the project will show only the allowed protocol, and no dropdown to change protocols will be presented.

## What are the relevant issue numbers?

Full implementation on GitLab's side for #18601 

GitLab Shell implementation: gitlab-org/gitlab-shell!62

GitLab Workhorse implementation: gitlab-org/gitlab-workhorse!51

## Screenshots (if relevant)

![Screen_Shot_2016-06-16_at_12.26.19_PM](/uploads/bad845142e9704a7385b2eaca51fd4eb/Screen_Shot_2016-06-16_at_12.26.19_PM.png)
![Screen_Shot_2016-06-20_at_4.24.54_PM](/uploads/6e452dd269e06f0be23841ce93866ed6/Screen_Shot_2016-06-20_at_4.24.54_PM.png)



/cc @jschatz1  this MR touches the UI. Please review.

See merge request !4696
2016-07-05 22:57:19 +00:00
Patricio Cano 0bdf6fe4ba Use keyword arguments for boolean values and use span instead of a for clone "button" 2016-07-05 16:54:22 -05:00
Patricio Cano be221a30ac Revert back to not defining a default Git access protocol. 2016-07-05 16:54:22 -05:00
Patricio Cano cb24650ab8 Rebasing caused enabled_git_access_protocol to become plural. Fixed here. 2016-07-05 16:54:22 -05:00
Patricio Cano 2e96fcff12 Clone button should not be clickable when there is a disabled protocol 2016-07-05 16:54:22 -05:00
Patricio Cano 29c50c5315 Default Git access protocol to web 2016-07-05 16:54:22 -05:00
Patricio Cano fbaabb3911 Rename enabled_git_access_protocols to singular. 2016-07-05 16:54:22 -05:00
Patricio Cano 120a1189bf Add alt text to the images in the documentation. 2016-07-05 16:54:22 -05:00
Patricio Cano d1151f7621 Don't allow empty strings in the protocol check. 2016-07-05 16:54:22 -05:00
Patricio Cano 9397ce9137 Correct access control flow for Git HTTP requests. 2016-07-05 16:54:22 -05:00
Patricio Cano da15471bb1 Clarify protocol access check, and make Git HTTP access call more specific. 2016-07-05 16:54:22 -05:00
Patricio Cano 0f54e2ae6c Render the status message with plain: so that the message gets passed to the Git client. 2016-07-05 16:54:22 -05:00
Patricio Cano 08018b7a7a Render :forbidden *only* if HTTP is disabled. 2016-07-05 16:54:22 -05:00