summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Improve readability in pipeline test objects factoryGrzegorz Bizon2016-11-251-6/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove pipeline factory that is not used in testsGrzegorz Bizon2016-11-251-6/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Restore method that ensures builds being createdGrzegorz Bizon2016-11-253-21/+52
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add Changelog entry for pipeline creation improvementsGrzegorz Bizon2016-11-251-0/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove remaining calls to CI yaml in pipeline specsGrzegorz Bizon2016-11-251-5/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move helpers to the end of process pipeline specsGrzegorz Bizon2016-11-251-29/+29
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update pipeline processing specs for creating buildsGrzegorz Bizon2016-11-251-35/+28
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Create pipeline along with builds in the transationGrzegorz Bizon2016-11-242-12/+9
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-3012-39/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `MergeRequest#pipeline` to `head_pipeline` ## What does this MR do? This MR renames `MergeRequest#pipeline` to `MergeRequest#head_pipeline` ## Does this MR meet the acceptance criteria? - [x] All builds are passing ## What are the relevant issue numbers? Closes #24810 See merge request !7783
| * | | | | | | | | | | | | | | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-2912-39/+56
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Sean McGivern2016-11-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite an HTTP link to use HTTPS See merge request !7834
| * | | | | | | | | | | | | | | | | Rewrite an HTTP link to use HTTPSAlex Jordan2016-11-291-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fix/ca-no-date' into 'master' Douwe Maan2016-11-305-6/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for builds with no start date throwing an error in cycle analytics events Instead of the error, we should inform that there is no start date - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - 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? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24925 See merge request !7738
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/fix/ca-no-date' into fix/ca-no-datefix/ca-no-dateJames Lopez2016-11-291-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Show dashes when date is emptyAlfredo Sumaran2016-11-281-4/+9
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | fix started_at checkJames Lopez2016-11-291-5/+1
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | fix rubocop warningJames Lopez2016-11-251-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | use an empty total time when the build has not started yet so the UI knowsJames Lopez2016-11-253-3/+29
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add changelog entryJames Lopez2016-11-251-0/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix for builds with no start date and specJames Lopez2016-11-252-1/+32
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '24772-fix-transient-failing-spec' into 'master' Sean McGivern2016-11-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a transient spec failure Closes #24772 See merge request !7825
| * | | | | | | | | | | | | | | Fix a transient spec failure24772-fix-transient-failing-specRémy Coutable2016-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting by created_at can lead to uncertainties if two records are created at the same time. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'add-stackprof' into 'master' Robert Speicher2016-11-304-0/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add StackProf to the Gemfile, along with a utility to get a profile for a spec The test suite needs speeding up significantly. This is one tool for investigating it. Related to #23034 See merge request !7784
| * | | | | | | | | | | | | | | | Add StackProf to the Gemfile, along with a utility to get a profile for a specNick Thomas2016-11-294-0/+130
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sh-update-sidekiq-cron' into 'master' Robert Speicher2016-11-303-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface: https://github.com/ondrejbartas/sidekiq-cron/commit/88ada926132d4658e3fd370c9f44899b6c88ccaf Closes #24376 See merge request !7815
| * | | | | | | | | | | | | | | | Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1sh-update-sidekiq-cronStan Hu2016-11-293-5/+10
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface. Closes #24376
* | | | | | | | | | | | | | | | Merge branch '23666-set-null-true-for-timestamps-columns-in-migrations' into ↵Robert Speicher2016-11-3023-24/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add `null: true` to timestamps in migrations that does not define it This is to ensure that migrations will still be consitent when we will upgrade to Rails 5 which default to `null: false` for timestamps columns. Fixes #23666. See merge request !7791
| * | | | | | | | | | | | | | | | Add `null: true` to timestamps in migrations that does not define it23666-set-null-true-for-timestamps-columns-in-migrationsRémy Coutable2016-11-2823-24/+24
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to ensure that migrations will still be consitent when we will upgrade to Rails 5 which default to `null: false` for timestamps columns. Fixes #23666. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'improve/invite-accept-page' into 'master' Douwe Maan2016-11-302-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alert user when logged in user email is not the same as the invitation ## What does this MR do? Add a note to the invitation page when the logged in user email is not the same as the invitation. ## Why was this MR needed? Help users to not accept invitations logged in with a wrong account. ## Screenshots (if relevant) ![1](/uploads/78ac6d3db67c9ed60cf74a20ad240d0b/1.png) ## Relevant issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24955 See merge request !7803
| * | | | | | | | | | | | | | | | Add a CHANGELOG entryimprove/invite-accept-pageDouglas Barbosa Alexandre2016-11-291-0/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Alert user when logged in user email is not the same as the invitationDouglas Barbosa Alexandre2016-11-291-3/+10
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ee-1137-follow-up-protected-branch-users-and-groups' into ↵Douwe Maan2016-11-304-16/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE-specific changes for gitlab-org/gitlab-ee#1137 ## What does this MR do? - gitlab-org/gitlab-ee#1137 is a `technical debt` issue to clean up the EE protected branch access levels (for users and groups) implementation. - Some of this cleanup bleeds over to code shared by CE and EE, which is why this MR is required. - An EE-specific MR has also been created: gitlab-org/gitlab-ee!927 See merge request !7821
| * | | | | | | | | | | | | | | | CE-specific changes gitlab-org/gitlab-ee#1137ee-1137-follow-up-protected-branch-users-and-groupsTimothy Andrew2016-11-294-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extract all common {push,merge} access level model code into the `ProtectedBranchAccess` module - Use the HTTP verb to define controller specs
* | | | | | | | | | | | | | | | | Merge branch '24999-fix-project-avatar-alignment' into 'master' Annabel Dunstone Gray2016-11-302-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the width of project avatars in order to adjust alignment within their container element ## What does this MR do? Adjusts the width of project avatars in order to fix their alignment within the container elements. ## Are there points in the code the reviewer needs to double check? To make sure there are no unintentional styles changes on unrelated elements. ## Why was this MR needed? To fix the issue seen below. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-26_at_3.55.58_PM](/uploads/c0012ee7bb5f9e83af41190f71f030fa/Screen_Shot_2016-11-26_at_3.55.58_PM.png) After: ![Screen_Shot_2016-11-26_at_3.56.17_PM](/uploads/c1236216382e6baa094570c17565e8cf/Screen_Shot_2016-11-26_at_3.56.17_PM.png) Affected pages: ![Screen_Shot_2016-11-26_at_4.12.38_PM](/uploads/8db6d86a5998843e7b7a755fb4000add/Screen_Shot_2016-11-26_at_4.12.38_PM.png) ## What are the relevant issue numbers? Closes #24999 See merge request !7772
| * | | | | | | | | | | | | | | | | Fix the width of project avatars in order to adjust alignment within their ↵Ryan Harris2016-11-262-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container element
* | | | | | | | | | | | | | | | | | Merge branch '25002-sentence-case-dashboard-tabs' into 'master' Annabel Dunstone Gray2016-11-303-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes project dashboard tabs to sentence casing Changes the nav tab titles on the project dashboard page (```https://gitlab.com/dashboard/projects```) from title casing to sentence casing. Before: ![Screen_Shot_2016-11-26_at_11.17.23_PM](/uploads/a31c951cf83f7670acee778db9337be5/Screen_Shot_2016-11-26_at_11.17.23_PM.png) After: ![Screen_Shot_2016-11-26_at_11.17.39_PM](/uploads/a0cb5f6b6771e6f5149750ea1e7beb02/Screen_Shot_2016-11-26_at_11.17.39_PM.png) Closes #25002 See merge request !7774
| * | | | | | | | | | | | | | | | | Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90acRyan Harris2016-11-291-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Changes project dashboard tabs to sentence casingRyan Harris2016-11-262-3/+7
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'add-sub-nav-active-color' into 'master' Annabel Dunstone Gray2016-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add blue back to sub nav active ## What does this MR do? Adds blue color back active sub nav tab ## Screenshots (if relevant) ![Screen_Shot_2016-11-29_at_10.00.55_AM](/uploads/b968fce60d8e25e7f0769f6fb045291c/Screen_Shot_2016-11-29_at_10.00.55_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/24149 See merge request !7829
| * | | | | | | | | | | | | | | | | Add blue back to sub nav activetauriedavis2016-11-291-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '25011-hoverstates-for-collapsed-issue-merge-request-sidebar' ↵Fatih Acet2016-11-292-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adds hoverstates for collapsed Issue/Merge Request sidebar This MR is part 1/2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/25011 ## What does this MR do? Adds hoverstates for collapsed Issue/Merge Request sidebar ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We needed hover states on the issue/merge request sidebar ## Screenshots (if relevant) ![2016-11-27_23.39.28](/uploads/adb83f5fa291cc8f89f1a7d7e2577546/2016-11-27_23.39.28.gif)![2016-11-27_23.39.13](/uploads/7018e4272da26cb06efb7c6fe4eae413/2016-11-27_23.39.13.gif) ![2016-11-29_16.05.11](/uploads/fcf9a674aa24cf0e7349a7e439b024fe/2016-11-29_16.05.11.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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? Closes #25011 See merge request !7777
| * | | | | | | | | | | | | | | | | Adds hoverstates for collapsed Issue/Merge Request sidebar25011-hoverstates-for-collapsed-issue-merge-request-sidebarDimitrie Hoekstra2016-11-292-5/+15
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch ↵24834-timeago-not-working-properly-on-dynamically-loading-diff-discussionsAlfredo Sumaran2016-11-292-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24135-new-project-should-be-below-new-group-on-the-welcome-screen' into 'master' New project should be below new group on the welcome screen ## What does this MR do? Places the group `.blank-slate` above the project's. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-26_at_13.52.33](/uploads/a6e28dc54ebfc42f0cff5b46558f4ff0/Screen_Shot_2016-11-26_at_13.52.33.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24135 See merge request !7770
| * | | | | | | | | | | | | | | | | Moved groups above projects24135-new-project-should-be-below-new-group-on-the-welcome-screenLuke "Jared" Bennett2016-11-292-11/+16
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'remove-jsx-react-eslint-plugins' into 'master' Fatih Acet2016-11-2912-36/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove JSX/React eslint plugins. ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [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 !7470
| * | | | | | | | | | | | | | | | | Remove JSX/React eslint plugins.remove-jsx-react-eslint-pluginsLuke "Jared" Bennett2016-11-2912-36/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change airbnb eslint config package to `eslint-config-airbnb-base` and update plugins. Change `airbnb` to `airbnb-base` for .eslintrc `extends` value. Added changelog entry Made sure all plugins and envs are set Corrected new failing specs
* | | | | | | | | | | | | | | | | | Merge branch 'feature/expose-timestimes-in-build-entity' into 'master' Grzegorz Bizon2016-11-292-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose timestamps in build entity ## What does this MR do? This MR exposes timestamps for build entity that is being used by serializers in `app/serializers`. ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? See https://gitlab.com/gitlab-org/gitlab-ce/issues/24844#note_19145053 See merge request !7818
| * | | | | | | | | | | | | | | | | | Expose timestamp in build entity used by serializerfeature/expose-timestimes-in-build-entityGrzegorz Bizon2016-11-292-9/+19
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '25055-pipelines-info-missing-from-mr-widget' into 'master' Annabel Dunstone Gray2016-11-292-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines info being hidden in merge request widget ## What does this MR do? Reintroduces CSS classes that are necessary for `MergeRequestWidget` to show correct divs. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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~~ - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25055 See merge request !7808
| * | | | | | | | | | | | | | | | | Fix pipelines info being hidden in merge request widget25055-pipelines-info-missing-from-mr-widgetAdam Niedzielski2016-11-292-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do need these "ci-#{status}" classes because we use them in MergeRequestWidget to show correct divs.