summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-2515-80/+101
|\
| * Merge branch 'support-api-lookup-by-username' into 'master' Dmitriy Zaporozhets2015-12-251-4/+10
| |\ | | | | | | | | | | | | | | | | | | Add API support for looking up a user by username Needed to support Huboard See merge request !2089
| | * Add API support for looking up a user by usernameStan Hu2015-12-241-4/+10
| | | | | | | | | | | | Needed to support Huboard
| * | Escape all the things.Douwe Maan2015-12-245-17/+20
| | |
| * | Merge branch 'ldap-special-chars-fix' into 'master' Douwe Maan2015-12-242-4/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix identity and user retrieval when special characters are used Fixes #4023 I also added tests to make sure the user with special characters in his name is returned correctly. @rspeicher this probably should be added to 8.3 as a patch. See merge request !2176
| | * No mb_chars needed anymoreldap-special-chars-fixDouwe Maan2015-12-241-2/+2
| | |
| | * Fix identity and user retrieval when special characters are usedPatricio Cano2015-12-222-3/+3
| | |
| * | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-241-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file. Fixes #3215. To do: - [ ] Add tests ----- ## "Edit" button on file in a project the user does NOT have write access to ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png) ## Clicking will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the edit page on the original project with a notice ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png) ## The user cannot change the target branch and is informed that editing will start an MR ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png) ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png) ----- ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png) ## Clicking any of these options will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the tree page on the original project with a notice ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png) ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png) ## Hitting "Create directory" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png) cc @dzaporozhets @skyruler See merge request !2145
| | * | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-181-1/+1
| | | |
| * | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-241-0/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix/visibility level setting in forked projects Fixes #3136 /cc @DouweM See merge request !1744
| | * \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-21118-1645/+1897
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (723 commits) Bump Rack Attack to v4.3.1 for security fix Remove duplicate entry in the changelog Remove extra spaces after branchname Fix merge-request-reopen button title Add branch and tag operation to tree dropdown Use gitlab-shell 2.6.9 Clarify Windows shell executor artifact upload support Fix feature specs: we always show the build status if ci_commit is present Do not display project group/name when issue and MR are in same project Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Use gitlab-workhorse 0.5.1 Fix ci_projects migration by using the value only from latest row [ci skip] Revert sidebar position for issue and merge request Add info on using private Docker registries in CI [ci skip] Upgrade Poltergeist to 1.8.1. #4131 Fix ux issue with "This issue will be closed automatically" message Move MR Builds tab next to Commits Api support for requesting starred projects for user Fix Rubocop complain. Fix merge widget JS for buttons ... Conflicts: app/models/project.rb
| | * | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-2049-339/+1734
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (296 commits) fox tests Don't rescue Exception, but StandardError adressing comments Update gitlab-shell documentation [ci skip] Align hash literals in IssuesFinder spec Fix tests Fix 'Attach a file' link in new tag form Add link to git-lfs client [ci skip] Do not limit workhorse POST/PUT size in NGINX added specs added spinach tests Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml Fix tests Commits without .gitlab-ci.yml are marked as skipped Changelog entry for finding issues performance Use a JOIN in IssuableFinder#by_project Memoize IssuableFinder#projects Removed trailing whitespace from IssuableFinder Added benchmark for IssuesFinder Updated DB schema with new issues/projects indexes ... Conflicts: app/models/project.rb
| | * \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-048-17/+26
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Use single spaces Improvements to profile page UI Replace all usages of `git` command with configurable binary path Update Shell Commands doc for configurable git binary path Minor reformatting for Facebook integration doc Use proper labels for OAuth providers Add Facebook authentication Bump stamp to ~> 0.6.0 Add extra padding between user description and links on profile page Fix tests Fix clipboard button overflow Apply new design for user profile page Improve profile page UI Better name for up-level links Fixed User sorting specs Only sort by IDs by default Added benchmark for User.all Add changelog entry for contacted_at Spread out runner contacted_at updates Only redirect to homepage url when its not the root url ...
| | * | | | | Fix GitlabV::isibilityLevel::level_name methodTomasz Maczukin2015-11-041-1/+1
| | | | | | |
| | * | | | | Move level_name resolving to Gitlan::VisibilityLevelTomasz Maczukin2015-11-031-0/+9
| | | | | | |
| * | | | | | Merge branch 'emoji-picker-fix' into 'master' Valery Sizov2015-12-241-36/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji picker: better alias handling related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576 See merge request !2198
| | * | | | | | Emoji picker: better alias handlingValery Sizov2015-12-241-36/+17
| | | | | | | |
| * | | | | | | Fix spelling of "it's" to "its" where appropriate.cafuego2015-12-242-7/+7
| | | | | | | |
| * | | | | | | Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets2015-12-231-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
| | * | | | | | | Add project permissions to all project API endpointsStan Hu2015-12-221-3/+3
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | This standardizes all the project API formats. Also needed to support Huboard.
| * | | | | | | Merge branch 'fix/ci-runners-token-persistence' into 'master' Grzegorz Bizon2015-12-231-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix method that ensures authentication token Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database. This closes #4235. See merge request !2185
| | * | | | | | Use method that creates runners registration tokenGrzegorz Bizon2015-12-231-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | `runners_registration_token` now creates a new token if it is blank.
| * | | | | | emoji picker: minor fixesValery Sizov2015-12-221-8/+0
| | | | | | |
| * | | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-9/+40
| |/ / / / /
* | | | | | Merge branch 'feature/import_kerberos_identities_ad' of ↵Dmitriy Zaporozhets2015-12-255-9/+73
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/cernvcs/gitlab-ee into ee-master
| * | | | | | Import Kerberos identities automatically from Active DirectoryAlex Lossent2015-12-102-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Kerberos authentication is enabled (either via Omniauth or for passwordless Git HTTP) together with an LDAP that is Active Directory (AD), we can automatically import Kerberos identities from Active Directory for LDAP users. These users can then authenticate to GitLab with Kerberos without having to attach their Kerberos identity beforehand via the Omniauth provider. This behavior is automatically enabled. It seems unlikely that one would enable Kerberos in an Active Directory environament and not want this behavior.
| * | | | | | Canonicalization of Kerberos identities to always include realmAlex Lossent2015-12-103-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolve inconsistences in Kerberos identities, as sometimes the realm would be included and sometimes not. Cf. gitlab-org/gitlab-ee#41
* | | | | | | Merge branch 'master' into ce_upstreamValery Sizov2015-12-232-0/+21
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+17
| |\ \ \ \ \ \
| | * | | | | | add CAS authentication supporttduehr2015-12-141-0/+17
| | | | | | | |
| * | | | | | | Merge branch 'git-version' into 'master' Douwe Maan2015-12-211-0/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show git version on admin page Before ![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png) After ![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png) gitlab-org/gitlab-ce#4077 See merge request !2101
| | * | | | | | | Show git version on admin pageTrey Davis2015-12-151-0/+4
| | |/ / / / / /
| * | | | | | | Backport JIRA serviceDrew Blessing2015-12-182-4/+28
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix confusing implementation detail in nginx config about how gitlab-pages ↵Kamil Trzcinski2015-12-182-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | work [ci skip]
* | | | | | | Bring back GitLab Pages SSL configKamil Trzcinski2015-12-182-0/+84
| | | | | | |
* | | | | | | Rename pages namespace or project path when changedKamil Trzcinski2015-12-183-29/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move UploadsTransfer to ProjectTransfer and inherit from this to UploadsTransfer and PagesTransfer
* | | | | | | Revert "Store pages in shared/pages/fqdn/fqdn/public or ↵Kamil Trzcinski2015-12-182-87/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future" This reverts commit 86a2a78f0d13a678899460638add6b862059433e.
* | | | | | | Store pages in shared/pages/fqdn/fqdn/public or ↵Kamil Trzcinski2015-12-182-4/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | shared/pages/fqdn/subpath/public - makes it simpler to implement CNAMEs in future
* | | | | | | Fix specsKamil Trzcinski2015-12-181-1/+1
| | | | | | |
* | | | | | | Add GitLab PagesKamil Trzcinski2015-12-183-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The pages are created when build artifacts for `pages` job are uploaded - Pages serve the content under: http://group.pages.domain.com/project - Pages can be used to serve the group page, special project named as host: group.pages.domain.com - User can provide own 403 and 404 error pages by creating 403.html and 404.html in group page project - Pages can be explicitly removed from the project by clicking Remove Pages in Project Settings - The size of pages is limited by Application Setting: max pages size, which limits the maximum size of unpacked archive (default: 100MB) - The public/ is extracted from artifacts and content is served as static pages - Pages asynchronous worker use `dd` to limit the unpacked tar size - Pages needs to be explicitly enabled and domain needs to be specified in gitlab.yml - Pages are part of backups - Pages notify the deployment status using Commit Status API - Pages use a new sidekiq queue: pages - Pages use a separate nginx config which needs to be explicitly added
* | | | | | | Fix rubocop complainsDmitriy Zaporozhets2015-12-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge remote-tracking branch 'ce/master'Robert Speicher2015-12-1771-735/+568
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'api-support-starred-projects' into 'master' Dmitriy Zaporozhets2015-12-161-0/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api support for requesting starred projects for user Closes #4112 Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet See merge request !2127
| | * | | | | | Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4112
| * | | | | | | Merge branch 'fix_rubocop' into 'master' Robert Speicher2015-12-161-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fix Rubocop complain. See merge request !2125
| | * | | | | | Fix Rubocop complain.fix_rubocopRubén Dávila2015-12-161-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'disable-markdown-cache' into 'master' Douwe Maan2015-12-161-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily disable Markdown caching See merge request !2120
| | * | | | | | Temporarily disable Markdown cachingDouwe Maan2015-12-161-1/+3
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-164-292/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'workhorse-passthrough' into 'master' Kamil Trzciński2015-12-164-292/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass all requests from NGINX to gitlab-workhorse See merge request !2073