home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,790 Commits 48 Branches 340 Tags
cfb5a76bb26521ff3ff68acc20466ea7feb49d9f
Commit Graph
3882 Commits
Author SHA1 Message Date
Douwe Maan bf89e06a45 Merge branch '18627-wildcard-branch-protection' into 'master' 
Allow specifying protected branches using wildcards

Closes #18627 

# Tasks

- [ ]  #18627 !4665 Allow specifying protected branches using wildcards
    - [x]  Find existing usages of protected branches
        - Protecting branches
            - `ProtectedBranchesController` is used to mark a branch protected/unprotected
            - `API::Branches` can be used to mark a branch protected/unprotected
        - Enforcing branch protection
            - `Gitlab::GitAccess` has helpers (`can_push_to_branch?`, `check`) that are used to deny pushes if a branch is protected
            - Over SSH: `gitlab-shell` receives a push, and calls `/allowed` on the GitLab API, which calls `GitAccess.check`
            - Over HTTP: 
                - `gitlab-workhorse` receives the request, and forwards it to rails
                - Rails (in the `GitHttpController#git-recieve-pack`) runs basic checks (is the user logged in, not protected branch checks) and returns ok with `GL_ID` and `RepoPath`
                - `gitlab-workhorse` looks at the response, and calls the relevant `gitlab-shell` action from `git-http/handlePostRPC`
                - Rest of this flow is the same as the SSH flow above
    - [x]  Implementation
        - [x]  Backend
            - [x]  Change `project#protected_branch?` to look at wildcard protected branches
            - [x]  Change `project#developers_can_push_to_protected_branch?`
            - [x]  Change `project#open_branches`
            - [x]  Better error message when creating a disallowed branch from the Web UI
        - [x]  Frontend
            - [x]  Protected branches page should allow typing out a wildcard pattern
            - [x]  Add help text explaining the use of wildcards
            - [x]  Show matching branches for each protected branch
                - [x]  ~~On the index page~~
                - [x]  On a show page
                - [x]  Index?
            - [x]  Can't have the "last commit" column for wildcard protected branches
    - [x]  Fix / write tests
    - [x]  What happens if a hook is missing in dev?
    - [x]  Refactor
    - [x]  Test workflows
        - Create a branch matching a wildcard pattern
        - Push to a branch matching a wildcard pattern
        - Force push to a branch matching a wildcard pattern
        - Delete a branch matching a wildcard pattern
        - [x]  Test using Web UI
        - [x]  Test over SSH
        - [x]  Test over HTTP
        - [x]  Test as developer and master
    - [x]  Investigate performance
        - [x]  Test with a large number of protected branches / branches
        - [x]  Paginate list of protected branches
        - [x]  ~~Possibly rewrite `open_branches`~~
    - [x]  Add `iid`s to existing `ProtectedBranch`es
    - [x]  Add documentation
    - [x]  Add CHANGELOG entry
    - [x]  Add screenshots
    - [x]  Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/2f753e3ed2ce681b4444944d521f4419e8ed37f7/builds) passes
    - [x]  Assign to endboss for review
    - [x]  Address @DouweM's comments
        - [x]  `protected_branch_params`
        - [x]  `exact_match` instead of `explicit_match`
        - [x]  When would self.name be blank?
        - [x]  Move `protected_branches.each` to a partial
        - [x]  Move `matching_branches.each` to a partial
        - [x]  If the branch is in @matching_branches, it's not been removed
        - [x]  move this regex to a method and memoize it
        - [x]  `commit_sha` directly for exact matches
        - [x]  Number of matches for wildcard matches, with a link
    - [x]  Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/43f9ce0e88194b8f719bb1c1e656b7fc13278d56/builds) to pass
    - [x]  Respond to @DouweM's comments
        - [x]  Don't use iid
        - [x]  Controller should use `@project.protected_branches.new`
        - [x]  move the memoization to `def wildcard_regex`
        - [x]  render with `collection: @protected_branches`
    - [x]  Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f7beedf122fa0c7aa89e86181fe7499321fb10ca/builds) to pass
    - [x]  Wait for @DouweM's review
    - [x]  Wait for @jschatz1's review
    - [x]  Respond to @jschatz1's comments
        - [x]  Use the new dropdown style
        - [x]  description should be moved to the description section without the styling
        - [x]  Protect button should be disabled when no branch is selected
    - [x]  Update screenshots
    - [x]  Merge conflicts
    - [x]  Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/20f3cfe8d5540eab64c2ba548043d600b28c61ba/builds) passes
    - [ ]  Revisit performance, possibly with staging/production data
        - [ ]  Get a dump of staging / run against staging live
            - [ ]  Get SSH access to staging
    - [ ]  Wait for review/merge






# Screenshots

## Creating wildcard protected branches

![1](/uploads/9446afccfdf6fa381e00c800dd2cc82e/1.png)
![2](/uploads/0b154503b297a818d3577488c575d845/2.png)
![3](/uploads/36217f79df9e41cc1550601f02627fe8/3.png)
![4](/uploads/041ca9bd529bcfa5373fca67e917cbcb/4.png)

### Using the `GLDropdown` component

![2016-06-30_14-16-15](/uploads/508afc2a5e2463c2954641409a560d88/2016-06-30_14-16-15.gif)

## Enforcing wildcard protected branches

### From the Web UI

![Screen_Shot_2016-06-20_at_1.21.18_PM](/uploads/8b5d4b1911e9152698a0488daf1880bc/Screen_Shot_2016-06-20_at_1.21.18_PM.png)

### Over SSH

![SSH](/uploads/7365989d7e4c406ef37b6ae5106442c9/SSH.gif)

### Over HTTPS

![HTTPS](/uploads/a7c0f56ae58efcffc75e6700fa2f4ac0/HTTPS.gif)

## Listing matching branches

![Screen_Shot_2016-06-20_at_1.33.44_PM](/uploads/d054113022f5d7ec64c0e57e501ac104/Screen_Shot_2016-06-20_at_1.33.44_PM.png)

See merge request !4665
 2016-07-07 22:37:30 +00: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
Patricio Cano cb24650ab8 Rebasing caused enabled_git_access_protocol to become plural. Fixed here. 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 5841851551 Added documentation on the access restrictions. 2016-07-05 16:54:22 -05:00
Patricio Cano 512adc21fe Add setting that allows admins to choose which Git access protocols are enabled 2016-07-05 16:54:22 -05:00
Robert Speicher 1768b6c063 Merge branch '8-10-guides' into 'master' 
Update installation & update guides for 8.10

[ci skip]

See merge request !5097
 2016-07-05 18:21:15 +00:00
Rémy Coutable 8c2894aeaf Update installation & update guides for 8.10 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-07-05 19:04:53 +02:00
Achilleas Pipinellis d498ebba0d Change doc location of custom hooks 2016-07-05 15:04:44 +03:00
Achilleas Pipinellis f56a685a30 Follow doc styleguide 2016-07-05 14:39:25 +03:00
Achilleas Pipinellis d250e8690d Add documentation for custom Git hook error message in GitLab's UI 2016-07-05 14:38:46 +03:00
Achilleas Pipinellis ea6e4bf0c2 Merge branch 'mrchrisw/docs/shibboleth' into 'master' 
Fix wording around NGINX Shibboleth setup

![image](/uploads/de69ad7a056083ab4ca337d9cacad6e2/image.png)

__________

![image](/uploads/bd8081aa0e3a7bd0568267c4a485df5d/image.png)



See merge request !5034
 2016-07-05 10:28:41 +00:00
Achilleas Pipinellis 57365b86db Add missing privileges to MySQL database 
[ci skip]
 2016-07-05 12:54:05 +03:00
Timothy Andrew 5de79c4f53 Add documentation for wildcard protected branches. 2016-07-05 11:06:15 +05:30
Achilleas Pipinellis 0d68e19909 Merge branch 'diagnosing-mail-issues' into 'master' 
Add troubleshooting section for SMTP settings



See merge request !5046
 2016-07-04 18:54:01 +00:00
Dmitriy Zaporozhets fd2b2dc1de Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-07-04 21:52:43 +03:00
Achilleas Pipinellis 432929fd45 Merge branch 'fix-dead-links' into 'master' 
Fix dead links in the docs (Jun 2016)

## What does this MR do?

Fix dead links in the docs found as of Jun 2016.

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

n/a

## Why was this MR needed?

This MR must improve UX on docs.gitlab.com.

## What are the relevant issue numbers?

Closes #19156 

## Does this MR meet the acceptance criteria?

- No [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) updated
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [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 !4921
 2016-07-04 16:49:18 +00:00
Hannes Rosenögger 25c66be492 Merge branch 'patch-1' into 'master' 
Update README.md - SSH password can be changed with `ssh-keygen -p`

SSH password can be changed with `ssh-keygen -p`

See merge request !4152
 2016-07-04 15:55:52 +00:00
Alejandro Rodríguez 52008045e5 Fix typo in Merge Requests API documentation 2016-07-02 17:44:19 -04:00
Tomasz Maczukin f1a85747ca Merge branch 'master' into dev-master 
* master: (98 commits)
  Enable Style/EmptyLines cop, remove redundant ones
  Update CHANGELOG
  Cache results from jQuery selectors to retrieve namespace name
  Fix import button when import fail due the namespace already been taken
  Fix snippets comments not displayed
  Fix emoji paths in relative root configurations
  Exclude requesters from Project#members, Group#members and User#members
  Upgrade Thin from 1.6.1 to 1.7.0.
  Many squashed commits
  Cache autocomplete results
  Upgrade Sidekiq from 4.1.2 to 4.1.4.
  Upgrade seed-fu from 2.3.5 to 2.3.6
  use has_many relationship with events
  Support creating a todo on issuables via API
  Expose target, filter by state as string
  Add todos API documentation and changelog
  Improve the request / withdraw access button
  Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab
  Groundwork for Kerberos SPNEGO (EE feature)
  Update CHANGELOG 8.9.5 for runners related fixes
  ...
 2016-07-02 22:58:21 +02:00
Achilleas Pipinellis 97424d0dd2 Merge branch 'patch-3' into 'master' 
adding link to .gitlab-ci.yml templates

closes #18998

## What does this MR do?

Add link to CI templates

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

No

## Why was this MR needed?

Asked by Sid - see #18998 

## What are the relevant issue numbers?

up 

## 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 !5033
 2016-07-01 17:10:19 +00:00
Rémy Coutable 557ca2b31f Merge branch 'todos-api' into 'master' 
Add Todos API

* Closes #14068
* Closes #14675 

- [x] Implementation
- [x]  Tests
- [x] Documentation
- [x] Changelog

See merge request !3188
 2016-07-01 15:36:05 +00:00
Stan Hu bca03d0875 Add troubleshooting section for SMTP settings 
[ci skip]
 2016-07-01 08:28:47 -07:00
Robert Schilling 87ac9c9850 Support creating a todo on issuables via API 2016-07-01 14:52:04 +02:00
Robert Schilling 3942621329 Expose target, filter by state as string 2016-07-01 14:52:04 +02:00
Robert Schilling fd9cd5ae8c Add todos API documentation and changelog 2016-07-01 14:51:59 +02:00
Rémy Coutable 8625bd3622 Improve the request / withdraw access button 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-07-01 12:48:54 +02:00
Chris Wilson 15eea9c715 Fix wording around NGINX Shibboleth setup 2016-07-01 03:28:10 +00:00
Marcia Ramos fe833adccd adding link to .gitlab-ci.yml templates - closes #18998 2016-07-01 03:17:39 +00:00
Rémy Coutable ce6635406c Make GH one-off auth the default again for importing GH projects 
Advertise the PAT as an alternative unless GH import is not configured.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-30 18:48:17 +02:00
Eric K IdemaandRémy Coutable 12aa1f898d Import from Github using Personal Access Tokens. 
This stands as an alternative to using OAuth to access a user's Github
repositories.  This is setup in such a way that it can be used without OAuth
configuration.

From a UI perspective, the how to import modal has been replaced by a full
page, which includes a form for posting a personal access token back to the
Import::GithubController.

If the user has logged in via GitHub, skip the Personal Access Token and go
directly to Github for an access token via OAuth.
 2016-06-30 18:48:17 +02:00
Douwe Maan 5e6342b7ac Merge branch '19312-confidential-issue' into 'master' 
Fix privilege escalation issue with OAuth external users

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/19312

This MR fixes a privilege escalation issue, where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.

/cc @douwe 

See merge request !1975
 2016-06-30 15:42:15 +00:00
Alejandro Rodríguez 4a8a69837a Add Application Setting to configure default Repository Path for new projects 2016-06-29 23:35:00 -04:00
Alejandro Rodríguez 86359ec854 Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
Douwe Maan 1d34ce13fc Merge branch 'issue_3359_3' into 'master' 
Insert notification settings dropdown into groups

## Display notification settings dropdown for groups

part of #3359   

![groups](/uploads/d61648236b81b0cca55fa2d73758f0df/groups.png)
![Screenshot_from_2016-06-29_10-58-37](/uploads/7be05ea6002932c094a81b25a308fd62/Screenshot_from_2016-06-29_10-58-37.png)  
![small](/uploads/6f2b556d734c870e358f6f56618a0bab/small.png)

See merge request !4857
 2016-06-29 19:23:03 +00:00
Jacob Schatz c8e4fe5625 Merge branch 'optimize-png-image' into 'master' 
optimize png images losslessly using zopflipng

Resend https://github.com/gitlabhq/gitlabhq/pull/10354#issuecomment-222194091

Optimized 246 png images losslessly using Google's zopflipng.
```
 app/assets/images/auth_buttons/azure_64.png        | Bin 986 -> 695 bytes
 app/assets/images/auth_buttons/bitbucket_64.png    | Bin 2163 -> 2161 bytes
 app/assets/images/auth_buttons/facebook_64.png     | Bin 2970 -> 870 bytes
 app/assets/images/auth_buttons/github_64.png       | Bin 2625 -> 1151 bytes
 app/assets/images/auth_buttons/gitlab_64.png       | Bin 2849 -> 2070 bytes
 app/assets/images/auth_buttons/google_64.png       | Bin 5281 -> 4366 bytes
 app/assets/images/auth_buttons/twitter_64.png      | Bin 4835 -> 3110 bytes
 app/assets/images/bg_fallback.png                  | Bin 167 -> 167 bytes
 app/assets/images/dark-scheme-preview.png          | Bin 3996 -> 3992 bytes
 app/assets/images/emoji.png                        | Bin 263533 -> 263346 bytes
 app/assets/images/emoji@2x.png                     | Bin 690504 -> 689076 bytes
 app/assets/images/gitlab_logo.png                  | Bin 5189 -> 3616 bytes
 app/assets/images/gitorious-logo-black.png         | Bin 809 -> 631 bytes
 app/assets/images/gitorious-logo-blue.png          | Bin 495 -> 201 bytes
 app/assets/images/icon-link.png                    | Bin 1128 -> 729 bytes
 app/assets/images/images.png                       | Bin 5849 -> 5806 bytes
 app/assets/images/monokai-scheme-preview.png       | Bin 3711 -> 3708 bytes
 app/assets/images/msapplication-tile.png           | Bin 5798 -> 4328 bytes
 app/assets/images/no_avatar.png                    | Bin 621 -> 621 bytes
 app/assets/images/no_group_avatar.png              | Bin 942 -> 939 bytes
 app/assets/images/slider_handles.png               | Bin 1377 -> 1341 bytes
 app/assets/images/touch-icon-ipad-retina.png       | Bin 8130 -> 5662 bytes
 app/assets/images/touch-icon-ipad.png              | Bin 3493 -> 2465 bytes
 app/assets/images/touch-icon-iphone-retina.png     | Bin 4997 -> 3460 bytes
 app/assets/images/touch-icon-iphone.png            | Bin 2766 -> 1949 bytes
 doc/administration/img/housekeeping_settings.png   | Bin 23856 -> 19347 bytes
 .../img/build_artifacts_browser.png                | Bin 89132 -> 82102 bytes
 .../img/build_artifacts_browser_button.png         | Bin 11614 -> 7230 bytes
 doc/ci/img/builds_tab.png                          | Bin 3845 -> 3047 bytes
 doc/ci/img/features_settings.png                   | Bin 18691 -> 15809 bytes
 doc/ci/quick_start/img/build_log.png               | Bin 63272 -> 52482 bytes
 doc/ci/quick_start/img/builds_status.png           | Bin 49121 -> 41838 bytes
 doc/ci/quick_start/img/new_commit.png              | Bin 9033 -> 7587 bytes
 doc/ci/quick_start/img/runners_activated.png       | Bin 27597 -> 22822 bytes
 .../img/single_commit_status_pending.png           | Bin 36431 -> 29981 bytes
 doc/ci/quick_start/img/status_pending.png          | Bin 19782 -> 16205 bytes
 doc/ci/runners/project_specific.png                | Bin 31408 -> 30196 bytes
 doc/ci/runners/shared_runner.png                   | Bin 18366 -> 17797 bytes
 doc/ci/runners/shared_to_specific_admin.png        | Bin 5897 -> 5715 bytes
 doc/ci/triggers/img/builds_page.png                | Bin 39713 -> 33324 bytes
 doc/ci/triggers/img/trigger_single_build.png       | Bin 2895 -> 2387 bytes
 doc/ci/triggers/img/trigger_variables.png          | Bin 5418 -> 4433 bytes
 doc/ci/triggers/img/triggers_page.png              | Bin 15889 -> 12943 bytes
 doc/container_registry/img/container_registry.png  | Bin 354050 -> 222782 bytes
 doc/container_registry/img/project_feature.png     | Bin 392842 -> 248750 bytes
 .../branded_login_page/appearance.png              | Bin 365120 -> 156228 bytes
 .../branded_login_page/custom_sign_in.png          | Bin 314111 -> 166674 bytes
 .../branded_login_page/default_login_page.png      | Bin 292731 -> 150538 bytes
 doc/development/gitlab_architecture_diagram.png    | Bin 46947 -> 23831 bytes
 .../basicsimages/add_new_merge_request.png         | Bin 9467 -> 9003 bytes
 doc/gitlab-basics/basicsimages/add_sshkey.png      | Bin 1463 -> 1394 bytes
 doc/gitlab-basics/basicsimages/branch_info.png     | Bin 7978 -> 7572 bytes
 doc/gitlab-basics/basicsimages/branch_name.png     | Bin 2199 -> 2137 bytes
 doc/gitlab-basics/basicsimages/branches.png        | Bin 3653 -> 3548 bytes
 .../basicsimages/button-create-mr.png              | Bin 6154 -> 5927 bytes
 .../basicsimages/click-on-new-group.png            | Bin 2063 -> 1957 bytes
 doc/gitlab-basics/basicsimages/commit_changes.png  | Bin 5567 -> 4941 bytes
 doc/gitlab-basics/basicsimages/commit_message.png  | Bin 5707 -> 5103 bytes
 doc/gitlab-basics/basicsimages/commits.png         | Bin 4258 -> 4112 bytes
 .../basicsimages/compare_branches.png              | Bin 1624 -> 1520 bytes
 doc/gitlab-basics/basicsimages/create_file.png     | Bin 2524 -> 2451 bytes
 doc/gitlab-basics/basicsimages/create_group.png    | Bin 3224 -> 3184 bytes
 doc/gitlab-basics/basicsimages/edit_file.png       | Bin 2259 -> 2221 bytes
 doc/gitlab-basics/basicsimages/file_located.png    | Bin 3156 -> 3078 bytes
 doc/gitlab-basics/basicsimages/file_name.png       | Bin 2544 -> 2412 bytes
 doc/gitlab-basics/basicsimages/find_file.png       | Bin 8840 -> 8426 bytes
 doc/gitlab-basics/basicsimages/find_group.png      | Bin 6159 -> 5897 bytes
 doc/gitlab-basics/basicsimages/fork.png            | Bin 1046 -> 896 bytes
 doc/gitlab-basics/basicsimages/group_info.png      | Bin 16217 -> 15479 bytes
 doc/gitlab-basics/basicsimages/groups.png          | Bin 4857 -> 4752 bytes
 doc/gitlab-basics/basicsimages/https.png           | Bin 2887 -> 2822 bytes
 doc/gitlab-basics/basicsimages/image_file.png      | Bin 2939 -> 2796 bytes
 doc/gitlab-basics/basicsimages/issue_title.png     | Bin 9059 -> 8311 bytes
 doc/gitlab-basics/basicsimages/issues.png          | Bin 4332 -> 4153 bytes
 doc/gitlab-basics/basicsimages/key.png             | Bin 1264 -> 1177 bytes
 doc/gitlab-basics/basicsimages/merge_requests.png  | Bin 4381 -> 4213 bytes
 .../basicsimages/new_merge_request.png             | Bin 3227 -> 3162 bytes
 doc/gitlab-basics/basicsimages/new_project.png     | Bin 2319 -> 2234 bytes
 doc/gitlab-basics/basicsimages/newbranch.png       | Bin 1314 -> 1244 bytes
 doc/gitlab-basics/basicsimages/paste_sshkey.png    | Bin 8620 -> 7699 bytes
 .../basicsimages/profile_settings.png              | Bin 1194 -> 1101 bytes
 doc/gitlab-basics/basicsimages/project_info.png    | Bin 21862 -> 21041 bytes
 .../basicsimages/public_file_link.png              | Bin 3038 -> 3023 bytes
 doc/gitlab-basics/basicsimages/select-group.png    | Bin 6075 -> 6034 bytes
 doc/gitlab-basics/basicsimages/select-group2.png   | Bin 5049 -> 5040 bytes
 doc/gitlab-basics/basicsimages/select_branch.png   | Bin 12213 -> 11207 bytes
 doc/gitlab-basics/basicsimages/select_project.png  | Bin 16832 -> 16176 bytes
 doc/gitlab-basics/basicsimages/settings.png        | Bin 4321 -> 4149 bytes
 doc/gitlab-basics/basicsimages/shh_keys.png        | Bin 4981 -> 4782 bytes
 .../basicsimages/submit_new_issue.png              | Bin 9083 -> 8644 bytes
 .../basicsimages/title_description_mr.png          | Bin 12749 -> 11919 bytes
 doc/gitlab-basics/basicsimages/white_space.png     | Bin 3707 -> 2192 bytes
 doc/integration/img/akismet_settings.png           | Bin 55837 -> 26625 bytes
 .../img/enabled-oauth-sign-in-sources.png          | Bin 49081 -> 21767 bytes
 doc/integration/img/facebook_api_keys.png          | Bin 125921 -> 85832 bytes
 doc/integration/img/facebook_app_settings.png      | Bin 134387 -> 68086 bytes
 doc/integration/img/facebook_website_url.png       | Bin 42292 -> 19823 bytes
 doc/integration/img/github_app.png                 | Bin 75297 -> 55591 bytes
 doc/integration/img/gitlab_app.png                 | Bin 55325 -> 30963 bytes
 .../img/gmail_action_buttons_for_gitlab.png        | Bin 17321 -> 16020 bytes
 doc/integration/img/google_app.png                 | Bin 52669 -> 29154 bytes
 .../img/oauth_provider_admin_application.png       | Bin 40579 -> 33440 bytes
 .../img/oauth_provider_application_form.png        | Bin 27974 -> 23048 bytes
 .../img/oauth_provider_application_id_secret.png   | Bin 33901 -> 27673 bytes
 .../img/oauth_provider_authorized_application.png  | Bin 32225 -> 26622 bytes
 .../img/oauth_provider_user_wide_applications.png  | Bin 40632 -> 33337 bytes
 doc/integration/img/twitter_app_api_keys.png       | Bin 72200 -> 36921 bytes
 doc/integration/img/twitter_app_details.png        | Bin 121621 -> 64686 bytes
 doc/markdown/img/logo.png                          | Bin 11097 -> 9509 bytes
 doc/monitoring/img/health_check_token.png          | Bin 10884 -> 6630 bytes
 .../performance/img/grafana_dashboard_dropdown.png | Bin 29419 -> 14368 bytes
 .../performance/img/grafana_dashboard_import.png   | Bin 40974 -> 18267 bytes
 .../img/grafana_data_source_configuration.png      | Bin 53402 -> 26060 bytes
 .../performance/img/grafana_data_source_empty.png  | Bin 44058 -> 21821 bytes
 .../performance/img/grafana_save_icon.png          | Bin 16024 -> 9107 bytes
 .../img/metrics_gitlab_configuration_settings.png  | Bin 45148 -> 37228 bytes
 doc/profile/2fa.png                                | Bin 23415 -> 22047 bytes
 doc/profile/2fa_auth.png                           | Bin 15569 -> 14535 bytes
 doc/project_services/img/builds_emails_service.png | Bin 41222 -> 33943 bytes
 .../img/jira_add_gitlab_commit_message.png         | Bin 57136 -> 46590 bytes
 .../img/jira_add_user_to_group.png                 | Bin 59251 -> 41994 bytes
 doc/project_services/img/jira_create_new_group.png | Bin 41294 -> 32934 bytes
 .../img/jira_create_new_group_name.png             | Bin 12535 -> 9054 bytes
 doc/project_services/img/jira_create_new_user.png  | Bin 26532 -> 21081 bytes
 doc/project_services/img/jira_group_access.png     | Bin 46028 -> 32210 bytes
 doc/project_services/img/jira_issue_closed.png     | Bin 92601 -> 77028 bytes
 doc/project_services/img/jira_issue_reference.png  | Bin 39942 -> 36188 bytes
 doc/project_services/img/jira_issues_workflow.png  | Bin 105237 -> 87067 bytes
 .../img/jira_merge_request_close.png               | Bin 111150 -> 102835 bytes
 doc/project_services/img/jira_project_name.png     | Bin 60598 -> 41572 bytes
 ...jira_reference_commit_message_in_jira_issue.png | Bin 42452 -> 33706 bytes
 doc/project_services/img/jira_service.png          | Bin 59082 -> 56834 bytes
 .../img/jira_service_close_issue.png               | Bin 88433 -> 79569 bytes
 doc/project_services/img/jira_service_page.png     | Bin 49122 -> 36280 bytes
 .../img/jira_submit_gitlab_merge_request.png       | Bin 63063 -> 51913 bytes
 .../img/jira_user_management_link.png              | Bin 58211 -> 43095 bytes
 .../img/jira_workflow_screenshot.png               | Bin 121534 -> 111093 bytes
 doc/project_services/img/redmine_configuration.png | Bin 21061 -> 16973 bytes
 .../img/services_templates_redmine_example.png     | Bin 17351 -> 13936 bytes
 doc/raketasks/backup_hrz.png                       | Bin 21955 -> 8907 bytes
 doc/raketasks/check_repos_output.png               | Bin 73786 -> 35333 bytes
 .../img/two_factor_authentication_settings.png     | Bin 20399 -> 16807 bytes
 doc/web_hooks/ssl.png                              | Bin 77165 -> 39120 bytes
 .../img/add_new_user_to_project_settings.png       | Bin 22822 -> 18149 bytes
 .../add-user/img/add_user_email_accept.png         | Bin 22961 -> 22877 bytes
 doc/workflow/add-user/img/add_user_email_ready.png | Bin 40305 -> 40207 bytes
 .../add-user/img/add_user_email_search.png         | Bin 45884 -> 45798 bytes
 .../add-user/img/add_user_give_permissions.png     | Bin 56480 -> 56380 bytes
 ...dd_user_import_members_from_another_project.png | Bin 38874 -> 38778 bytes
 .../add-user/img/add_user_imported_members.png     | Bin 37873 -> 37835 bytes
 .../add-user/img/add_user_list_members.png         | Bin 24427 -> 24337 bytes
 .../add-user/img/add_user_members_menu.png         | Bin 42319 -> 42224 bytes
 .../add-user/img/add_user_search_people.png        | Bin 39941 -> 39844 bytes
 doc/workflow/award_emoji.png                       | Bin 16926 -> 9939 bytes
 doc/workflow/ci_mr.png                             | Bin 40065 -> 29571 bytes
 doc/workflow/close_issue_mr.png                    | Bin 146292 -> 82595 bytes
 doc/workflow/environment_branches.png              | Bin 40210 -> 20745 bytes
 doc/workflow/forking/branch_select.png             | Bin 55352 -> 27299 bytes
 doc/workflow/forking/merge_request.png             | Bin 60597 -> 31560 bytes
 doc/workflow/four_stages.png                       | Bin 20934 -> 10003 bytes
 doc/workflow/git_pull.png                          | Bin 167056 -> 94405 bytes
 doc/workflow/gitdashflow.png                       | Bin 184726 -> 131491 bytes
 doc/workflow/github_flow.png                       | Bin 20600 -> 10251 bytes
 doc/workflow/gitlab_flow.png                       | Bin 90883 -> 70871 bytes
 doc/workflow/good_commit.png                       | Bin 28433 -> 13131 bytes
 doc/workflow/groups/add_member_to_group.png        | Bin 138184 -> 78060 bytes
 doc/workflow/groups/group_dashboard.png            | Bin 107332 -> 59446 bytes
 doc/workflow/groups/group_with_two_projects.png    | Bin 129319 -> 73101 bytes
 doc/workflow/groups/max_access_level.png           | Bin 135354 -> 74947 bytes
 doc/workflow/groups/new_group_button.png           | Bin 185406 -> 108482 bytes
 doc/workflow/groups/new_group_form.png             | Bin 106491 -> 58860 bytes
 .../groups/other_group_sees_shared_project.png     | Bin 118382 -> 64447 bytes
 doc/workflow/groups/override_access_level.png      | Bin 157193 -> 90122 bytes
 doc/workflow/groups/project_members_via_group.png  | Bin 151339 -> 86260 bytes
 doc/workflow/groups/share_project_with_groups.png  | Bin 118868 -> 65633 bytes
 doc/workflow/groups/transfer_project.png           | Bin 164958 -> 92115 bytes
 doc/workflow/img/award_emoji_select.png            | Bin 65985 -> 49296 bytes
 .../img/award_emoji_votes_least_popular.png        | Bin 144501 -> 116715 bytes
 .../img/award_emoji_votes_most_popular.png         | Bin 136577 -> 108775 bytes
 .../img/award_emoji_votes_sort_options.png         | Bin 162251 -> 131659 bytes
 doc/workflow/img/cherry_pick_changes_commit.png    | Bin 353067 -> 304098 bytes
 .../img/cherry_pick_changes_commit_modal.png       | Bin 312659 -> 264883 bytes
 doc/workflow/img/cherry_pick_changes_mr.png        | Bin 252085 -> 212267 bytes
 doc/workflow/img/cherry_pick_changes_mr_modal.png  | Bin 225569 -> 186597 bytes
 doc/workflow/img/file_finder_find_button.png       | Bin 30974 -> 25458 bytes
 doc/workflow/img/file_finder_find_file.png         | Bin 42658 -> 35114 bytes
 .../img/forking_workflow_choose_namespace.png      | Bin 70405 -> 59114 bytes
 doc/workflow/img/forking_workflow_fork_button.png  | Bin 26438 -> 20750 bytes
 .../img/forking_workflow_path_taken_error.png      | Bin 22380 -> 17978 bytes
 doc/workflow/img/new_branch_from_issue.png         | Bin 120622 -> 54607 bytes
 doc/workflow/img/revert_changes_commit.png         | Bin 360098 -> 233750 bytes
 doc/workflow/img/revert_changes_commit_modal.png   | Bin 327932 -> 205046 bytes
 doc/workflow/img/revert_changes_mr.png             | Bin 367881 -> 241051 bytes
 doc/workflow/img/revert_changes_mr_modal.png       | Bin 335010 -> 211022 bytes
 doc/workflow/img/todos_icon.png                    | Bin 6320 -> 3843 bytes
 doc/workflow/img/todos_index.png                   | Bin 184839 -> 152040 bytes
 .../img/web_editor_new_branch_dropdown.png         | Bin 34233 -> 20436 bytes
 doc/workflow/img/web_editor_new_branch_page.png    | Bin 21618 -> 11245 bytes
 .../img/web_editor_new_directory_dialog.png        | Bin 26145 -> 13339 bytes
 .../img/web_editor_new_directory_dropdown.png      | Bin 33714 -> 20007 bytes
 doc/workflow/img/web_editor_new_file_dropdown.png  | Bin 34978 -> 20680 bytes
 doc/workflow/img/web_editor_new_file_editor.png    | Bin 128658 -> 66261 bytes
 doc/workflow/img/web_editor_new_push_widget.png    | Bin 11220 -> 7076 bytes
 doc/workflow/img/web_editor_new_tag_dropdown.png   | Bin 33753 -> 20080 bytes
 doc/workflow/img/web_editor_new_tag_page.png       | Bin 75536 -> 36610 bytes
 .../img/web_editor_start_new_merge_request.png     | Bin 14352 -> 8596 bytes
 doc/workflow/img/web_editor_upload_file_dialog.png | Bin 46219 -> 21502 bytes
 .../img/web_editor_upload_file_dropdown.png        | Bin 34835 -> 20651 bytes
 .../bitbucket_import_select_project.png            | Bin 16121 -> 15288 bytes
 .../fogbugz_importer/fogbugz_import_finished.png   | Bin 53276 -> 30266 bytes
 .../fogbugz_importer/fogbugz_import_login.png      | Bin 44444 -> 20797 bytes
 .../fogbugz_import_select_fogbogz.png              | Bin 35415 -> 20526 bytes
 .../fogbugz_import_select_project.png              | Bin 62552 -> 34836 bytes
 .../fogbugz_importer/fogbugz_import_user_map.png   | Bin 157856 -> 77208 bytes
 .../importing/gitlab_importer/importer.png         | Bin 40778 -> 18366 bytes
 .../importing/gitlab_importer/new_project_page.png | Bin 72663 -> 33589 bytes
 .../img/import_projects_from_github_importer.png   | Bin 28033 -> 22711 bytes
 ...mport_projects_from_github_new_project_page.png | Bin 17225 -> 13668 bytes
 doc/workflow/merge_commits.png                     | Bin 41422 -> 22181 bytes
 doc/workflow/merge_request.png                     | Bin 169503 -> 98070 bytes
 doc/workflow/merge_requests/commit_compare.png     | Bin 110376 -> 65010 bytes
 doc/workflow/merge_requests/merge_request_diff.png | Bin 166226 -> 103239 bytes
 .../merge_request_diff_without_whitespace.png      | Bin 121476 -> 71896 bytes
 doc/workflow/merge_when_build_succeeds/enable.png  | Bin 151112 -> 68769 bytes
 doc/workflow/merge_when_build_succeeds/status.png  | Bin 180318 -> 82655 bytes
 doc/workflow/messy_flow.png                        | Bin 33829 -> 19314 bytes
 doc/workflow/milestones/form.png                   | Bin 88591 -> 84872 bytes
 doc/workflow/milestones/group_form.png             | Bin 77087 -> 74429 bytes
 doc/workflow/mr_inline_comments.png                | Bin 193311 -> 117313 bytes
 doc/workflow/notifications/settings.png            | Bin 90986 -> 59256 bytes
 doc/workflow/production_branch.png                 | Bin 21716 -> 10946 bytes
 .../protected_branches/protected_branches1.png     | Bin 170113 -> 155815 bytes
 .../protected_branches/protected_branches2.png     | Bin 25851 -> 23208 bytes
 doc/workflow/rebase.png                            | Bin 123041 -> 68976 bytes
 doc/workflow/release_branches.png                  | Bin 44173 -> 22163 bytes
 doc/workflow/releases/new_tag.png                  | Bin 154755 -> 87330 bytes
 doc/workflow/releases/tags.png                     | Bin 165449 -> 93016 bytes
 doc/workflow/remove_checkbox.png                   | Bin 22272 -> 12339 bytes
 doc/workflow/share_with_group.png                  | Bin 53784 -> 50450 bytes
 doc/workflow/shortcuts.png                         | Bin 108255 -> 108209 bytes
 .../wip_merge_requests/blocked_accept_button.png   | Bin 65231 -> 32720 bytes
 doc/workflow/wip_merge_requests/mark_as_wip.png    | Bin 41549 -> 21640 bytes
 doc/workflow/wip_merge_requests/unmark_as_wip.png  | Bin 32151 -> 16606 bytes
 public/apple-touch-icon-precomposed.png            | Bin 11097 -> 9509 bytes
 public/apple-touch-icon.png                        | Bin 11097 -> 9509 bytes
 spec/fixtures/dk.png                               | Bin 1143 -> 1062 bytes
```

cc @connorshea

See merge request !4325
 2016-06-29 17:00:44 +00:00
Patricio Cano 10444f61f8 Fixed privilege escalation issue where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the external_providers list. 2016-06-29 10:37:54 -05:00
Felipe Artur d2971315ab Merge branch 'master' into issue_3359_3 2016-06-29 11:32:38 -03:00
Felipe Artur 36d48120f6 merge master into issue_3359_3 2016-06-29 11:04:18 -03:00
Peter Dave Hello 9e6f99744e optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
Tim bc313deaae Added Bugzilla as external issue tracker option 
Requested in #14669

Added note to changelog
 2016-06-29 06:01:54 -04:00
Rémy Coutable b8d75d41aa Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' 
Find all builds for commit if there are multiple pipelines for it

## What does this MR do?

This MR fixes a builds API. When multiple pipelines were triggered for a commit, then API returned builds only from the last pipeline.

## What are the relevant issue numbers?

Closes #18912  
Closes #19243 

## 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 !4849
 2016-06-28 17:10:07 +00:00
Achilleas Pipinellis 1ade080ec8 Merge branch 'iankelling-api-doc' into 'master' 
docs: fix default_branch_protection default



See merge request !4479
 2016-06-28 14:57:42 +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
Stan Hu 3be80540aa Add SMTP upgrade information 
Closes #19252

[ci skip]
 2016-06-28 04:27:40 -07:00
Grzegorz Bizon 087f080871 Add documentation for commit builds API improvements 2016-06-28 13:04:11 +02: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
Chris Wilson 5eba2670c7 Add "GitLab team members only" to diagram link 2016-06-28 03:12:26 +00: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