Commit Graph
31255 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets abc6004fae Merge branch '19170-mobile-buttons' into 'master'
Switched mobile button icons to ellipsis and angle

## What does this MR do?
Switches the mobile button icons

## What are the relevant issue numbers?
Closes #19170   
Part of #19200 

## Screenshots (if relevant)
![Screen_Shot_2016-06-27_at_9.08.28_AM](/uploads/7784489402e342e671d02b24d2ea0d64/Screen_Shot_2016-06-27_at_9.08.28_AM.png)


See merge request !4944
2016-06-28 14:28:56 +00:00
Alfredo SumaranandDmitriy Zaporozhets ca92ad9043 Update CHANGELOG 2016-06-28 16:01:42 +02:00
Annabel DunstoneandDmitriy Zaporozhets 706c5a1399 Switched mobile button icons to ellipsis and angle 2016-06-28 16:01:42 +02:00
Dmitriy Zaporozhets bbbd0e6c81 Merge branch '19171-pinned-width' into 'master'
Resolve "Pin should show up at 1280px min"

## What does this MR do?
Decreased window min width for pinned sidebar

## What are the relevant issue numbers?
Closes  #19171    
Part of #19200 

## Screenshots (if relevant)
![Screen_Shot_2016-06-27_at_9.36.13_AM](/uploads/d0a87bca5af1bee808c5b1046c0ecf72/Screen_Shot_2016-06-27_at_9.36.13_AM.png)

See merge request !4947
2016-06-28 13:57:14 +00:00
Kamil Trzciński ec1029922e Merge branch 'use-git-depth' into 'master'
Use GIT_DEPTH for builds

## What does this MR do?
Enables experimental feature to use shallow cloning. 

## Why was this MR needed?
To speed up the builds and reduce the pressure on NFS servers. This should save us between 30s to 1m of the time of each build.

## More information
 `GIT_DEPTH`: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188

## Problems
- Too small value for `GIT_DEPTH` can make it impossible to retry old changes.
You will see `unresolved reference` in build log.
We should then reconsider changing `GIT_DEPTH` to higher value
- Mechanism that rely on `git describe` may not work correctly when `GIT_DEPTH` is set. This will happen, because only part of the git history is present on the build machine

## Requirements
GitLab Runner 1.3.0. Currently all our internal runners use beta release or 1.3.0 with support for `GIT_DEPTH`.

@pcarranza Please decide when to merge that. We should start monitoring to see an impact on our NFS servers.

cc @jacobvosmaer-gitlab @pcarranza 


See merge request !4730
2016-06-28 13:46:16 +00:00
Achilleas Pipinellis 9315597adb Merge branch 'add-smtp-upgrade-info' into 'master'
Add SMTP upgrade information

8.8 to 8.9 requires an update to the SMTP settings for source installs.

See merge request !4966
2016-06-28 13:11:26 +00:00
Annabel DunstoneandPhil Hughes b262e240aa Update CHANGELOG 2016-06-28 13:42:35 +01:00
Annabel DunstoneandPhil Hughes 2e1a70fefc Decreased window min width for pinned sidebar 2016-06-28 13:41:46 +01:00
Stan Hu 3be80540aa Add SMTP upgrade information
Closes #19252

[ci skip]
2016-06-28 04:27:40 -07:00
Achilleas Pipinellis 365015e3c9 Merge branch 'gitlab_architecture' into 'master'
Refactor GitLab architecture document

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14236

See merge request !3694
2016-06-28 10:34:46 +00:00
Rémy Coutable 1897d75bdc Merge branch 'display-deleted-ref-in-events' into 'master'
Display last commit of deleted branch in push events

## What does this MR do?

Display the last commit of a deleted branch in the push events of a project.

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

Is the change in `app/models/event.rb` the correct way to display a two-line event for deleted branches?

## Why was this MR needed?

It is easier to restore an accidentally deleted branch if the commit hash is displayed in the push events.

## What are the relevant issue numbers?

Fixes #18659

## Screenshots

### Before garbage collection

![before-gc](/uploads/5674cd53e1564d48b7f2f8406ea0fbed/before-gc.png)

### After garbage collection

![after-gc](/uploads/80950c1932feeb3b69d0fc11b8f7acf4/after-gc.png)

See merge request !4699
2016-06-28 10:30:03 +00:00
winniehell 8fb4c506e2 Display last commit of deleted branch in push events (!4699) 2016-06-28 11:49:30 +02:00
Rémy Coutable 2c3f3cb392 Merge branch 'fix/attr-encrypted-issue' into 'master'
Fix encrypted data backwards compatibility after upgrading attr_encrypted gem

Adds missing attribute to attr_encrypted so it is fully backwards-compatible. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19073

See merge request !4963
2016-06-28 08:48:06 +00:00
Rémy Coutable 0d0f8a3b7d Merge branch 'feature/custom-highlighting' into 'master'
Add custom highlighting via .gitattributes

## What does this MR do?
Allows user control of language selection via a `gitlab-language` entry in `.gitattributes`

## Are there points in the code the reviewer needs to double check?
(paired with @stanhu)

## Why was this MR needed?
Guessing languages by filename is fraught and often wrong. In one project, `foo.pl` may be perl, and in another it may be prolog. Users might have a Thingfile that needs ruby highlighting, or depend on things that can't work in general, like `*.C` (capitalized) mapping to C++ instead of C.

This allows the user to override language choice so they never have to look at a mis-highlighted file.

## What are the relevant issue numbers?
https://github.com/jneen/rouge/issues/494
https://gitlab.com/gitlab-org/gitlab-ce/issues/13818 (*.tpl can't in general map to Smarty)
https://gitlab.com/gitlab-org/gitlab-ce/issues/13615 (in cases we don't have a language and mis-identify it, users could map to 'text' to turn off highlighting)

## Screenshots (if relevant)

## 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 (N/A)
- [x] 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 !4606
2016-06-28 08:42:42 +00:00
James Lopez ea441cf27e add changelog 2016-06-28 09:57:13 +02:00
James Lopez 31c95aa031 add missing attribute to attr_encrypted so it is fully backwards-compatible 2016-06-28 09:55:19 +02:00
Chris Wilson 5eba2670c7 Add "GitLab team members only" to diagram link 2016-06-28 03:12:26 +00:00
Robert Speicher c9a4626333 Merge remote-tracking branch 'dev/master' 2016-06-27 18:39:42 -04:00
http://jneen.net/ ffd8162191 doc: note that .gitattributes uses default branch 2016-06-27 14:17:49 -07:00
http://jneen.net/ f06fe77531 use the conf lexer so we have highlighted comments 2016-06-27 14:17:49 -07:00
http://jneen.net/ 8c15989621 first draft of docs 2016-06-27 14:17:49 -07:00
http://jneen.net/ 66b37149eb support cgi style options, such as erb?parent=json 2016-06-27 14:17:49 -07:00
http://jneen.net/ e7b512efa6 move the path alias to a more appropriate location 2016-06-27 14:17:49 -07:00
http://jneen.net/ e08ff468e8 make #custom_language private 2016-06-27 14:17:49 -07:00
http://jneen.net/ c8b52761bc appease rubocop 2016-06-27 14:17:49 -07:00
http://jneen.net/ 5ff8371c5e add an alias for Snippet#path 2016-06-27 14:17:49 -07:00
http://jneen.net/ 9fc53864dd appease rubocop 2016-06-27 14:17:49 -07:00
http://jneen.net/ 5415c67424 check the tag so that an instance will pass too 2016-06-27 14:17:49 -07:00
http://jneen.net/ cd9bea770b fix the spec, using project.change_head 2016-06-27 14:17:49 -07:00
http://jneen.net/ 8d24ca157d Revert "bump the master sha for gitlab-test!9"
This reverts commit b435d7405364d28ec364072f4437512da2876762.
2016-06-27 14:17:49 -07:00
http://jneen.net/ d76a89bf7f bump the master sha for gitlab-test!9 2016-06-27 14:17:49 -07:00
http://jneen.net/ f8b80f7fae add custom highlighting via .gitattributes
paired with @stanhu
2016-06-27 14:17:49 -07:00
Robert Speicher 0fd4b9d3e2 Merge branch 'rename_license_template_api' into 'master'
Rename Licenses API to License Templates API

## What does this MR do?

Earlier I renamed this in EE, thinking license templates was an EE-only feature. This backports that change to CE. Thanks to @vsizov for pointing out this error.

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/400 for the EE merge request. 

See merge request !4957
2016-06-27 20:15:31 +00:00
Drew Blessing 1910fd05ae Rename Licenses API to License Templates API 2016-06-27 14:42:05 -05:00
Douwe Maan e4dacb353e Merge branch 'issue_18398' into 'master'
Check for conflict with wiki projects when creating a new project.

## What does this MR do?
Check for conflict with wiki projects when creating a new project
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
To avoid exposing the information from the wiki repository of other project
## What are the relevant issue numbers?
#18398 
## Screenshots (if relevant)
![Screen_Shot_2016-06-24_at_6.03.49_PM](/uploads/7bf55e5159bf0c2b653b8f4f941f72fc/Screen_Shot_2016-06-24_at_6.03.49_PM.png)
## 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
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [ ] 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 !4918
2016-06-27 19:15:22 +00:00
Robert Speicher 8a197c15d4 Merge branch 'fix-18997' into 'master'
Fix visibility of snippets when searching

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

See merge request !1972
2016-06-27 18:43:12 +00:00
Robert Speicher 7d8b3a0314 Merge branch '19102-fix' into 'master'
Fix an information disclosure when requesting access to a group containing private projects

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

The commit speaks for itself:

    Fix an information disclosure when requesting access to a group containing private projects
    
    The issue was with the `User#groups` and `User#projects` associations
    which goes through the `User#group_members` and `User#project_members`.
    
    Initially I chose to use a secure approach by storing the requester's
    user ID in `Member#created_by_id` instead of `Member#user_id` because I
    was aware that there was a security risk since I didn't know the
    codebase well enough.
    
    Then during the review, we decided to change that and directly store the
    requester's user ID into `Member#user_id` (for the sake of simplifying
    the code I believe), meaning that every `group_members` / `project_members`
    association would include the requesters by default...
    
    My bad for not checking that all the `group_members` / `project_members`
    associations and the ones that go through them (e.g. `Group#users` and
    `Project#users`) were made safe with the `where(requested_at: nil)` /
    `where(members: { requested_at: nil })` scopes.
    
    Now they are all secure.

See merge request !1973
2016-06-27 18:41:31 +00:00
Robert Speicher 298e4ece30 Merge branch 'regex-find-replace-http-matcher' into 'master'
Use `have_http_status` matcher where possible

See merge request !4955
2016-06-27 18:38:23 +00:00
Robert Speicher 9c9b0eef46 Merge branch 'cherry-pick-5734e266' into 'master'
Fix rendering of commit notes

See merge request !4953
2016-06-27 18:31:45 +00:00
Ruben Davila 16a0303801 Check for conflict with wiki projects when creating a new project.
This fix avoids exposing the information from the wiki repository of other project.
2016-06-27 13:23:19 -05:00
Z.J. van de Weg abca19da8b Use HTTP matchers if possible 2016-06-27 20:10:42 +02:00
Jacob Schatz e0e325625e Merge branch 'emoji-menu-stick-search' into 'master'
Made the search bar on emoji menu sticky

## What does this MR do?

When scrolling down the emoji menu, the search bar disappears. For better UX, the search bar no stays at the top when scrolling.

## Screenshots (if relevant)

![emoji-sticky](/uploads/a5b4773547d3d67342ddcfc07c8f1568/emoji-sticky.gif)

See merge request !4743
2016-06-27 18:03:08 +00:00
Douwe Maan c6f75fa4f4 Update CHANGELOG 2016-06-27 18:02:03 +00:00
Douwe MaanandDouwe Maan c2223efe84 Fix rendering of commit notes 2016-06-27 18:00:18 +00:00
Stan Hu c3a8b252cd Merge branch 'update-omniauth-saml' into 'master'
Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-saml

## What does this MR do?

Updates `omniauth-saml` to bring in the new `ruby-saml` dependency that addresses [CVE-2016-5697](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5697)

Fixes #19206 

See merge request !4951
2016-06-27 17:50:24 +00:00
Robert Speicher 21842cf90f Merge branch 'mark-done-todo-id' into 'master'
Correctly return todo ID after creating todo

See merge request !4941
2016-06-27 17:49:29 +00:00
Fatih Acet 121c5c837f Merge branch '19075-new-wiki' into 'master'
Remove duplicate new page btn from edit wiki

## What does this MR do?
Removes duplicate button on wiki page

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

## Screenshots (if relevant)
![Screen_Shot_2016-06-24_at_9.45.28_AM](/uploads/8dca96c3e75b428d63acaaba6dede9a6/Screen_Shot_2016-06-24_at_9.45.28_AM.png)
![Screen_Shot_2016-06-24_at_9.45.57_AM](/uploads/e6ea97b07e48d2fe6f108d8c5a943583/Screen_Shot_2016-06-24_at_9.45.57_AM.png)

See merge request !4904
2016-06-27 17:29:03 +00:00
Stan Hu 0fcd72e06f Merge branch 'workhorse-gmake' into 'master'
Mention gmake

Fixes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/46

See merge request !4945
2016-06-27 17:12:29 +00:00
Fatih Acet 70c0d87a5e Merge branch 'new-branch-check-fix' into 'master'
Fix check for existence of New Branch button on Issue page

## What does this MR do?

The condition in [`initCanCreateBranch`][initCanCreateBranch] mistakenly checks `$container` (the New Branch button) for falsy. However JQuery returns an empty array if no matching element was found, so this condition is never met.

## Why was this MR needed?

The wrong condition causes:
* `$.getJSON($container.data('path'))` to be called where `$container.data('path')` is `undefined`
* in this case `$.getJSON` uses `location.href`
* if the current page has a JSON representation, it is fetched and cached by browser and displayed the next time the page is visited (#17365)
* otherwise "Failed to check if new branch can be created" is displayed (#17264)

## What are the relevant issue numbers?

Fixes #17264 and #17365.

[initCanCreateBranch]: https://gitlab.com/gitlab-org/gitlab-ce/blob/v8.8.4/app/assets/javascripts/issue.js.coffee#L102


See merge request !4630
2016-06-27 16:59:05 +00:00
Annabel Dunstone c0bb6d4abf Removed duplicate Changelog entries 2016-06-27 11:58:39 -05:00