summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Add ignore whitespace change option to commit viewMinsik Yoon2015-12-011-1/+6
|
* Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-262-6/+2
|
* Emoji bug: Invalid url to imageaward_fixValery Sizov2015-11-221-1/+1
|
* Award: merge request fixValery Sizov2015-11-211-2/+5
|
* Fix for Emojinotes_fix_stablenotes_fixValery Sizov2015-11-201-1/+1
|
* Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-193-3/+27
|\ | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
| * adressing commentsValery Sizov2015-11-191-6/+6
| |
| * satisfy rubocopValery Sizov2015-11-191-2/+2
| |
| * Emoji: fix image of emoji when it is submitted via commentValery Sizov2015-11-191-0/+1
| |
| * award for merge requests[ci skip]Valery Sizov2015-11-191-1/+1
| |
| * award emojiValery Sizov2015-11-193-3/+26
| |
* | Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master' Robert Speicher2015-11-192-38/+62
|\ \ | |/ |/| | | | | | | | | | | | | Add option to create merge request when editing/creating a file Replaces !1611 Fixes #3059 See merge request !1820
| * DRY up codedirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-181-30/+24
| |
| * Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-182-15/+23
| |\
| * | Add "Start a new merge request" option to every commit formDouwe Maan2015-11-172-25/+41
| | |
| * | Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-editDouwe Maan2015-11-1720-65/+165
| |\ \
| * | | Add option to create merge request when editing/creating a fileDirceu Pereira Tiegs2015-10-191-2/+16
| | | |
* | | | Fix redirect after import fails.Douwe Maan2015-11-181-2/+2
| |_|/ |/| |
* | | Merge branch 'compare-first-commit' into 'master' Robert Speicher2015-11-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly set comparison first commit when range includes a merge commit Fixes #3207. See merge request !1814
| * | | Correctly set comparison first commit when range includes a merge commitcompare-first-commitDouwe Maan2015-11-171-2/+2
| | | |
* | | | Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-171-13/+21
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent the last owner of a group from being able to delete themselves by 'adding' themselves as a master Replaces !1708. Fixes #1111. See merge request !1815
| * | | Use project member abilities more extensivelyDouwe Maan2015-11-171-13/+21
| | | |
* | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-161-6/+1
|/ / / | | | | | | | | | | | | This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
* | | Merge branch 'fix_trailing_title_space' of ↵Dmitriy Zaporozhets2015-11-162-2/+6
|\ \ \ | | | | | | | | | | | | https://gitlab.com/dblessing/gitlab-ce
| * | | Fix trailing space issue with merge requests and issues. Fixes #2514Drew Blessing2015-11-102-2/+6
| | | |
* | | | Expose CI enable option in project featuresKamil Trzcinski2015-11-131-1/+1
| | | | | | | | | | | | | | | | - Enable CI by default for all new projects
* | | | Add ignore white space option in merge request diffMinsik Yoon2015-11-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
* | | | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets2015-11-121-1/+6
|\ \ \ \ | | | | | | | | | | Avoid render edit_form in each notes.
| * | | | Avoid render edit_form in each notes.Jason Lee2015-11-121-1/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).
* | | | Merge branch 'artifacts' into 'master' Kamil Trzciński2015-11-111-0/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Build Artifacts This implements #3028 1. It stores artifacts in shared/artifacts, 1. It adds `artifacts` to `.gitlab-ci.yml`, 1. We use GitLab Workhorse to offload artifacts uploading, 1. To download artifacts it uses GitLab Workhorse X-Sendfile extension, 1. There's one "artifact" per-build. The new upload removes previous one and creates a new one, 1. Default max artifact size is set to 100MB - this can be changed in settings. Missing things: 1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files, 1. Artifacts passing between builds. GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5 GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46 Syntax: ``` artifacts: untracked: true # default: false paths: # default: empty - bin/files ``` See merge request !1584
| * | | Implement Build ArtifactsKamil Trzcinski2015-11-101-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
* | | | Merge branch 'issue_3072_target_name' into 'master' Dmitriy Zaporozhets2015-11-101-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display target branch on MR list when it is different from project's default Fixes #3072 The screenshot below shows both previous and current UI state: ![branch-mr-both](/uploads/5c1f0519e42bae4655f3eee37edfc356/branch-mr-both.png) First merge request has default branch as a target, second one has non default branch as target. See merge request !1741
| * | | Display target branch on MR list when it is different from project's defaultAnton Baklanov2015-11-101-0/+1
| |/ /
* | | Merge remote-tracking branch 'origin/release-notes'Dmitriy Zaporozhets2015-11-102-9/+42
|\ \ \ | |/ / |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add missing param and title for tagrelease-notesDmitriy Zaporozhets2015-11-091-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor release code a bitDmitriy Zaporozhets2015-11-092-11/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve UI for tags pageDmitriy Zaporozhets2015-11-051-7/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | After tag is created - redirect to tag pageDmitriy Zaporozhets2015-11-051-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add release description to new tag formDmitriy Zaporozhets2015-11-051-0/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Create show page for tag and render release notes there and on index pageDmitriy Zaporozhets2015-11-052-5/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add ability to edit and show release notesDmitriy Zaporozhets2015-11-051-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | More release related logic to separate resourceDmitriy Zaporozhets2015-11-052-8/+32
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add edit/update tag actions for future release notesDmitriy Zaporozhets2015-11-051-0/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | CI details cleanupKamil Trzcinski2015-11-052-19/+29
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add page titles to CI settings. - Fix CI admin navigation. - Remove duplicated scope. - Use monospace font for commit sha. - Add page title and header title to build page. - Proper authorization for cancel/retry builds. - Use gitlab pagination theme for builds and group members. - Don't paginate builds widget on build page. - Add badges to commit page Changes/Builds tabs. - Add "Builds" to commit Builds tab page title. - Add and use Ci::Build#retryable? method. - Add CI::Build#retried? method. - Allow all failed commit builds to be retried. - Proper authorization for cancel/retry all builds. - Remove unused param. - Use time_ago_with_tooltip where appropriate. - Tweak builds index text - Remove duplication between builds/build and commit_statuses/commit_status. - Use POST rather than GET for canceling and retrying builds. - Remove redundant URL helpers. - Add build ID to build page. - Link branch name on build page. - Move commit/:sha/ci to commit/:sha/builds.
* | Add ability to create directories in the editorBen Ford2015-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Simply type a name with a `/` directory separator and new directories will be created. This does not do the fancy UI work that github.com does, but it will get the job done. I could not find tests for file creation, so I didn't add a test for this slight behaviour modification. I did test directory traversals though, using both absolute paths like `/tmp/foo.txt` and relative paths like `../../foo.txt`. Neither case escaped the repository, though attempting to traverse with a relative path resulted in a 500 error that did not affect application stability upon reload.
* | Fix specific runner visibilityKamil Trzcinski2015-10-261-5/+4
| |
* | Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-232-6/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI regressions This MR fixes a couple of small CI regressions - Allow developer to manage builds - On CI Admin page show only projects that are present in GitLab - On Runner CI Admin page show only projects that are present in GitLab - Refresh build log only when status changes - Show the oldest builds on top when viewing Builds - it most cases it shows running builds on top - Fix Lint rendering - Fix number of other builds in build widget Fixes #3164 Fixes #3161 Fixes gitlab-org/gitlab-ci#343 See merge request !1679
| * | Allow developer to manage buildsKamil Trzcinski2015-10-232-2/+17
| | |
| * | Fix small CI UI regressionsKamil Trzcinski2015-10-231-4/+5
| | |
* | | Merge branch 'comments_fix' into 'master' Dmitriy Zaporozhets2015-10-231-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork https://dev.gitlab.org/gitlab/gitlabhq/issues/2535 See merge request !1675
View Lorry Controller Status