summaryrefslogtreecommitdiff
path: root/features/steps/project
Commit message (Collapse)AuthorAgeFilesLines
* MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-0/+4
|
* Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-061-0/+1
|\ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Enforce the fork_project permission in Projects::CreateServiceNick Thomas2016-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Projects::ForkService delegates to this service almost entirely, but needed one small change so it would propagate create errors correctly. CreateService#execute needs significant refactoring; it is now right at the complexity limit set by Rubocop. I avoided doing so in this commit to keep the diff as small as possible. Several tests depend on the insecure behaviour of ForkService, so fi them up at the same time.
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-033-5/+7
|\ \
| * \ Merge branch 'full-width-new-snippet-button' into 'master' Fatih Acet2016-09-261-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added full-width new snippet button on mobile and corrected capitalization ## What does this MR do? Adds full-width `New snippet` button to snippet mobile views and corrects `New Snippet` to `New snippet` throughout. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? @connorshea Spotted that I missed this in !6210 :) ## Screenshots (if relevant) ![Screen_Shot_2016-09-16_at_10.40.21](/uploads/ddca2da3a5ef787298bfc87e129db820/Screen_Shot_2016-09-16_at_10.40.21.png) ## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) ## What are the relevant issue numbers? See merge request !6380
| | * Added full-width new snippet button on mobile and corrected capitalizationfull-width-new-snippet-buttonLuke Bennett2016-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Altered specs that click capitalised New Snippet button Applied review feedback missed in Changes `.no-comment` `opactiy: 0.5` to `opacity: .5` Added `.btn-wide-on-xs` and applied to snippet buttons
| * | fix issues mr counterbarthc2016-09-202-2/+2
| |/
| * Fix issuable_bulk_update_path and merge request spinach testDmitriy Zaporozhets2016-09-081-1/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-09-021-1/+1
|\ \ | |/
| * Project tools visibility levelFelipe Artur2016-09-011-1/+1
| |
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-3010-18/+49
|\ \ | |/
| * Merge branch 'dz-merge-request-version'Douwe Maan2016-08-251-3/+3
| |\
| | * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-222-6/+6
| | |\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-193-5/+6
| | |\ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-157-1/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix Spinach branches specfix-spinach-branches-specSean McGivern2016-08-231-0/+5
| | |_|_|/ | |/| | |
| * | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-191-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
| | * \ \ \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-182-2/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Add expiration date to group membershipsSean McGivern2016-08-181-1/+1
| | | | | |
| | * | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-187-2/+18
| | |\ \ \ \
| | * | | | | Allow to edit access expiration date.Adam Niedzielski2016-08-051-1/+1
| | | | | | |
| * | | | | | Don't use global variables.ace-venturaConnor Shea2016-08-181-4/+4
| | |_|/ / / | |/| | | |
| * | | | | Merge branch '18334-truncate-award-emoji-users' into 'master' Jacob Schatz2016-08-181-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncated long user lists in award emoji tooltips ## What does this MR do? Truncates award emoji tooltips so that they only show 10 users maximum. Further users are indicated by appending "and X more." ## Are there points in the code the reviewer needs to double check? Is 10 too little, should it be raised? My test cases rely on join() to build the expected output. This feels a little iffy is it alright? ## Why was this MR needed? Some issues have a large number of thumbs causing tooltips to be very large. ## What are the relevant issue numbers? closes #18334, closes #19542 ## Screenshots (if relevant) ##### Before ![Screenshot_from_2016-06-20_19-49-12](/uploads/d7a14dd87bb3da2acd7c0818de99852b/Screenshot_from_2016-06-20_19-49-12.png) ##### After ![Screenshot_from_2016-06-20_19-50-58](/uploads/f7f05c44594bfe8cec7dfd48802753a6/Screenshot_from_2016-06-20_19-50-58.png) Truncation point modified for purposes of screenshot ## 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 - [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 !4780
| | * | | | | Award tooltips refer to current user as "You"Jack Davison2016-08-171-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Fix broken feature spec.fix-issue-filter-specRuben Davila2016-08-171-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This older spec was failing: features/project/issues/issues.feature Looks like before we were doing an exact match for queries, that's why it was passing with this existing issue: https://gitlab.com/gitlab-org/gitlab-ce/blob/59fa031e6f7d5a1b658c370f581c4caaf4493150/features/project/issues/issues.feature#L128 Failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/3178231
| * | | | Now waits for All issuables to load when clickedremove-sleep-calls-from-phantom-update-spinach-specsLuke Bennett2016-08-172-0/+4
| | | | |
| * | | | Removed sleep calls introduced in !5740Luke Bennett2016-08-172-3/+0
| |/ / /
| * | | Fixed filtering testsPhil Hughes2016-08-131-1/+2
| | | |
| * | | Updated failing testsPhil Hughes2016-08-131-0/+1
| | | |
| * | | Updated testsPhil Hughes2016-08-136-0/+10
| | | |
| * | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-083-2/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (363 commits) Added changelog item for issuable form dropdowns Add 'run tests' docs from GDK Bump gitlab_git to lazy load compare commits Add examples to repository files API (!5465) Ignore URLs starting with // (!5677) Add failing test for #7032 Update timeago to shorter representation Add missing DOWNTIME constant to the AddTimestampsToMembersAgain migration Added guide about migrations and downtime Update CHANGELOG for 8.10.4 Add a data migration to fix some missing timestamps in the members table (again) Move abilities by subject class to a dedicated method Remove unnecessary empty line after css var Set consistency in list text height css Add description to text/plain emails Fix Rename `add_users_into_project` and `projects_ids` fix spec Underscore variable to camelCase using shared path for project import uploads and refactored gitlab remove export worker Structure the development documentation ...
| | * | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-041-0/+3
| | | |/ | | |/|
| | * | Improve spinach test to be more specific about link to clickStan Hu2016-07-311-1/+1
| | |/ | | | | | | | | | | | | If you add another branch to gitlab-test that includes the word 'test', browse_files.feature will fail with an ambiguous match.
| | * Fix all specs related to changes in !5081.Timothy Andrew2016-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1. Remove `Project#developers_can_push_to_protected_branch?` since it isn't used anymore. 2. Remove `Project#developers_can_merge_to_protected_branch?` since it isn't used anymore.
| * | Use new badge template to render build status badgeGrzegorz Bizon2016-08-081-1/+1
| |/
| * Add spec for dashes in pathsStan Hu2016-07-241-4/+4
| |
| * Add a spec for #20079.Timothy Andrew2016-07-221-0/+10
| | | | | | | | | | The issue was fixed in 2ba5e62. The spec is going in separately just so the fix could go in as soon as possible.
* | Fixed up frontend code based on feedbackPhil Hughes2016-07-201-3/+5
| | | | | | | | Updated a test to be more specific about where the content is
* | Revert "Merge branch 'revert-bdb6f1e6' into 'master'"Phil Hughes2016-07-202-8/+7
|/ | | This reverts merge request !5290
* Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-152-7/+8
| | | This reverts merge request !4970
* Merge branch 'gl-dropdown-issuable-form' into 'master' Jacob Schatz2016-07-152-8/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL dropdowns in issuable form ## What does this MR do? Changed all the issuable dropdown menus over to user GL dropdowns. This brings the dropdowns to be inline with the issuable filter dropdowns and allows for labels to be created whilst creating/editing an issuable. ## What are the relevant issue numbers? Closes #12574 ## Screenshots (if relevant) See merge request !4970
| * Updated testsPhil Hughes2016-07-072-8/+7
| |
* | Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-111-19/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single file diffs Closes #14103. Related (not part of this MR): #19553. This adds a `diff_for_path` action to each place we render diffs (commit, compare, new MR, existing MR) which renders the diff for a single path. The action is always available with the same params as the 'parent' action, to make it simpler to generate the URIs. If a diff is bigger than 10 KB, it will be collapsed by default and have a data attribute added. You can then click the message or the filename to expand that diff. For expanded files, you can collapse and expand them, but they won't make any AJAX requests. ![Expand_and_collapse_diffs](/uploads/a4072029085082b85c47006f67ac531c/Expand_and_collapse_diffs.gif) See merge request !4990
| * | Disable overflow messagesSean McGivern2016-07-081-19/+0
| | | | | | | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more.
* | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master' Douwe Maan2016-07-111-4/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitlab-Workhorse-Send-Data to send entry ## What does this MR do? Use Gitlab-Workhorse-Send-Data to send entry: Closes #19224, Closes #19128 Also requires this MR to work: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/53 ## Are there points in the code the reviewer needs to double check? Do we have a test for this? ## Why was this MR needed? This way gitlab-workhorse does not have to call any API. See merge request !5094
| * | Just remove the prefix, feedback:send-entry-via-Gitlab-Workhorse-Send-DataLin Jen-Shin2016-07-111-1/+2
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5094#note_12987385
| * | Fix one of the failing tests. Test against the headersLin Jen-Shin2016-07-061-4/+9
| |/
* | Add DiffNote modelDouwe Maan2016-07-061-2/+1
| |
* | Rename MergeRequest methods that return commits or shas to be more clear and ↵Douwe Maan2016-07-061-1/+1
|/ | | | consistent