summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add tests for project destroy servicerepo-removeDmitriy Zaporozhets2015-06-031-0/+34
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move repository when project is removedDmitriy Zaporozhets2015-06-034-27/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ths commit does next: * When we remove project we move repository to path+deleted.git * Then we schedule removal of path+deleted with sidekiq * If repository move failed we abort project removal This should help us with NFS issue when project get removed but repository stayed. The full explanation of problem is below: * rm -rf project.git * rm -rf removes project.git/objects/foo * NFS server renames foo to foo.nfsXXXX because some NFS client (think * Unicorn) still has the file open * rm -rf exits, but project.git/objects/foo.nfsXXX still exists * Unicorn closes the file, the NFS client closes the file (foo), and the * NFS server removes foo.nfsXXX * the directory project.git/objects/ still exists => problem So now we move repository and even if repository removal failed Repository directory is moved so no bugs with project removed but repository directory taken. User still able to create new project with same name. From administrator perspective you can easily find stalled repositories by searching `*+deleted.git` Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-023-0/+30
|\
| * Merge branch 'ci_yml_file' into 'master'Dmitriy Zaporozhets2015-06-023-0/+30
| |\ | | | | | | | | | | | | | | | GitLab CI service sends gitlab-ci.yml file See merge request !689
| | * GitLab CI service sends gitlab-ci.yml fileci_yml_fileValery Sizov2015-06-023-0/+30
| |/
* | Merge pull request #8730 from drunkard/masterMarin Jankovski2015-06-022-1/+7
|\ \ | |/ |/| Specify shell while run me as git user
| * Improve comments for shell_pathDrunkard Zhang2015-05-041-3/+2
| |
| * Specify shell while run me as git userDrunkard Zhang2015-02-042-1/+8
| | | | | | | | | | | | | | | | Some users disabled "git" user's shell after finished installation, this will lead to "This account is currently not available" and could not run /etc/init.d/gitlab, this dirty trick fix it. Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
* | Improve hover colorDmitriy Zaporozhets2015-06-022-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'web-editor-rugged' into 'master'Dmitriy Zaporozhets2015-06-0215-282/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create and edit files in web editor via rugged - [x] create file via rugged - [x] update file via rugged - [x] remove file via rugged - [ ] fix tests - [x] remove satellites code - [x] create activity event for new/edit file via rugged - [x] base64 support Part of https://dev.gitlab.org/gitlab/gitlabhq/issues/2300 See merge request !751
| * | Remove unnecessary satellite files and add CHANGELOG itemDmitriy Zaporozhets2015-06-024-81/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make web editor work correctly after switch from satellitesDmitriy Zaporozhets2015-06-025-5/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove files in web editor using ruggedDmitriy Zaporozhets2015-06-024-17/+40
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove now unnecessary satelittes logic for creating and editing file with ↵web-editor-ruggedDmitriy Zaporozhets2015-06-023-143/+0
| | | | | | | | | | | | | | | | | | web editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Create activity event and execute hooks on web editor commitDmitriy Zaporozhets2015-06-023-3/+11
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove file api tests which depend on old satellite logicDmitriy Zaporozhets2015-06-021-32/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Use rugged in web editor for base64 encodingDmitriy Zaporozhets2015-06-012-34/+28
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Allow base64 for edit blobsDmitriy Zaporozhets2015-06-011-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix adding new file to empty repoDmitriy Zaporozhets2015-06-013-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Create and edit files in web editor via ruggedDmitriy Zaporozhets2015-06-015-17/+62
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'rs-issue-1721' into 'master'Douwe Maan2015-06-022-3/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link_to_gfm with only a reference having the incorrect link Before: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` After: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/foo">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` Closes #192 Closes #1721 Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115) See merge request !739
| * | | Fix link_to_gfm with only a reference having the incorrect linkrs-issue-1721Robert Speicher2015-05-292-3/+22
| | | | | | | | | | | | | | | | Closes #1721
* | | | Merge branch 'feature/sso_integration' into 'master'Douwe Maan2015-06-025-0/+25
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to automatically sign-in with an Omniauth provider Split of !669 as requested This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication. See merge request !723
| * | | Add an option to automatically sign-in with an Omniauth provider without ↵Alex Lossent2015-05-295-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | showing the GitLab sign-in page This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.
* | | | Merge branch 'refactor-header' into 'master'Dmitriy Zaporozhets2015-06-0115-200/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor header css/html * Fixes UI issue with header on zoom * Replace duplicate numbers with variable * Better names for css classes * refactor header views Fixes #1640 See merge request !750
| * | | | improve navbar collapse for mobile viewsDmitriy Zaporozhets2015-06-013-13/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix header overflow for big titleDmitriy Zaporozhets2015-06-012-23/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor header viewsDmitriy Zaporozhets2015-06-017-27/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | More fixes to header cssDmitriy Zaporozhets2015-06-016-9/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor header css/htmlrefactor-headerDmitriy Zaporozhets2015-06-017-153/+153
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'linguist-comment' into 'master'Dmitriy Zaporozhets2015-06-011-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain gitlab forks in Gemfile Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2358 See merge request !749
| * | | | Add comments about gitlab forksDmitriy Zaporozhets2015-06-011-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Exmplain gitlab-linguist fork existenceDmitriy Zaporozhets2015-06-011-0/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Better margin for header in accept MR widgetDmitriy Zaporozhets2015-06-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Show avatars in merge widget and fix mr download button overflowDmitriy Zaporozhets2015-06-012-11/+10
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'disable-mr-source-branch-change' into 'master'Dmitriy Zaporozhets2015-06-015-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable changing of the source branch in merge request update API As noted in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/738#note_1307284 See merge request !745
| * | | | Disable changing of the source branch in merge request update APIStan Hu2015-05-295-8/+12
| | | | |
* | | | | Merge branch 'feature/sign_out_page' into 'master'Dmitriy Zaporozhets2015-06-017-2/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to configure a URL to show after sign out Split of !669 as requested This is especially useful with SAML ( !722 ) since the omniauth-saml gem does not support single log-out. This provides a way to log out the user from the SAML IdP after signing out from GitLab. See merge request !725
| * | | | | Allow to configure a URL to show after sign outAlex Lossent2015-05-297-2/+20
| | |/ / / | |/| | |
* | | | | Improve UI for accept MR widgetDmitriy Zaporozhets2015-06-011-13/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' into 'master'Robert Schilling2015-05-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | small typo See merge request !747
| * | | | | small typoTerrence Benade2015-05-311-1/+1
|/ / / / /
* | | | | Merge branch 'fix/saml_changelog' into 'master'Robert Schilling2015-05-291-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | Fix misplaced changelog entry for SAML support See merge request !746
| * | | | Fix misplaced changelog entry for SAML supportAlex Lossent2015-05-291-1/+1
| |/ / /
* | | | Improve UI of project sidebarDmitriy Zaporozhets2015-05-293-9/+14
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-296-4/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to leave project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !744
| * | | Make leave buttons more explicitleave-projectDmitriy Zaporozhets2015-05-292-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add changelog item about leave project featureDmitriy Zaporozhets2015-05-291-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add ability to leave projectDmitriy Zaporozhets2015-05-293-1/+29
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'support-edit-target-branch-in-mr' into 'master'Dmitriy Zaporozhets2015-05-2911-5/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support editing target branch of merge request ### What does this MR do? This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens. ### Why was this MR needed? Because lots of people requested this feature. :) ### Screenshots **Edit MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png) **New MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png) **System note** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png) ### What are the relevant issue numbers? * Closes https://github.com/gitlabhq/gitlabhq/issues/7105 * See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130! See merge request !738
View Lorry Controller Status