summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Incorporate feedback -- Deployed Time agozj-deployed-ago-keep-around-commitZ.J. van de Weg2016-09-272-3/+3
|
* Changed deployments to environments and pull the deployment time if ↵Luke Bennett2016-09-263-41/+49
| | | | available. Also added perm check.
* Reintroduce tests after removing themZ.J. van de Weg2016-09-265-1/+72
| | | | | | In previous commits on this branch I've removed methods and their tests. Now these methods where used by another branch so I needed to reintroduce them.
* Merge branch 'master' into zj-deployed-ago-keep-around-commitZ.J. van de Weg2016-09-26188-693/+4920
|\
| * Merge branch 'rs-remove-gitlab_meta' into 'master' Dmitriy Zaporozhets2016-09-262-7/+1
| |\ | | | | | | | | | | | | | | | | | | Remove gitlab_meta gem See merge request !6510
| | * Remove gitlab_meta gemrs-remove-gitlab_metaRobert Speicher2016-09-252-7/+1
| | |
| * | Merge branch 'cannonical-typo' into 'master' Robert Speicher2016-09-251-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in README [ci skip] See merge request !6512
| | * | Fix typo in README cannonical-typoSean McGivern2016-09-251-1/+1
| |/ / | | | | | | cannonical -> canonical
| * | Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master' Robert Speicher2016-09-252-9/+43
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use base SHA for patches and diffs ## What does this MR do? Switch from using 'start SHA' to 'base SHA' for patches and diffs ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Makes the downloaded patches and diffs on the merge request page match the frontend-rendered "changes" in these scenarios: * Unpatched gitlab-workhorse, downloading patchsets of open MRs (https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/68) * Unpatched gitlab-workhorse, downloading diffs of open and merged MRs * Patched gitlab-workhorse, downloading patchsets of merged merge requests ## What are the relevant issue numbers? Closes #22229 See merge request !6435
| | * Use base SHA for patches and diffsNick Thomas2016-09-222-9/+43
| | | | | | | | | | | | | | | | | | | | | This commit changes the revisions used for diffs. The current behaviour is to show all changes between current tip of master and tip of the MR, rather than matching the output of the web frontend (which just shows the changes in the MR). Switching from start_sha to base_sha fixes this.
| * | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-09-251-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in README.md ## What does this MR do? Fixes a typo in the documentation of the gitlab-ci-runner environment variables See merge request !6340
| | * | Fix typo in README.mdJohan Brandhorst2016-09-141-1/+1
| | | |
| * | | Merge branch 'update-changelog' into 'master' Rubén Dávila Santos2016-09-241-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CHANGELOG. cc: @stanhu See merge request !6505
| | * | | Fix CHANGELOG.Ruben Davila2016-09-241-1/+4
| |/ / /
| * | | Merge branch 'gitlab-ce-milestone-tab-badges' into 'master' Fatih Acet2016-09-247-11/+98
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Milestone tab badges ### What does this MR do? Adds count badges to the tabs on the Milestone page to mirror the Issue page. ### Are there points in the code the reviewer needs to double check? CSS: Padding was added to the `.milestone` element to make expired milestones look good. ### Why was this MR needed? For consistency with other tabs ### What are the relevant issue numbers? Closes #20114 ### Screenshots (if relevant) **Before** <img src="/uploads/1f75853a863a9058ee409916b7ee4057/Screen_Shot_2016-07-22_at_13.22.20.png" width="362"> **After** <img src="/uploads/8a058290850f571db249dd9b23f5138d/Screen_Shot_2016-07-22_at_13.21.58.png" width="303"> ![Screen_Shot_2016-08-23_at_1.42.56_AM](/uploads/b072dc6bdf505b2fce46660beaf0eae7/Screen_Shot_2016-08-23_at_1.42.56_AM.png) ![Screen_Shot_2016-08-23_at_1.43.15_AM](/uploads/e7440bf2aa628aa4dba63863083699c0/Screen_Shot_2016-08-23_at_1.43.15_AM.png) ### Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [x] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5946
| | * | | Ensure milestone counts work with no datagitlab-ce-milestone-tab-badgesAlfredo Sumaran2016-09-072-23/+22
| | | | | | | | | | | | | | | | | | | | Commit originally written by @smcgivern
| | * | | Fix failing specs and improve htmlAlfredo Sumaran2016-09-075-15/+26
| | | | |
| | * | | Added a small helper to reduce logic in the viewDan Rowden2016-09-072-3/+14
| | | | |
| | * | | Take out of /dashboard/milestones as the helper query clashes with kaminari ↵Dan Rowden2016-09-071-4/+8
| | | | | | | | | | | | | | | | | | | | arrays
| | * | | Updated milestone count helper plus testsDan Rowden2016-09-074-5/+43
| | | | |
| | * | | Use newer hash styleDan Rowden2016-09-072-6/+6
| | | | |
| | * | | Improved milestone counts with a single queryDan Rowden2016-09-072-14/+15
| | | | |
| | * | | ChangelingDan Rowden2016-09-071-0/+3
| | | | |
| | * | | Show badges in Milestone tabs and padding in Milestone list (both to match ↵Dan Rowden2016-09-073-6/+26
| | | | | | | | | | | | | | | | | | | | Issues page)
| * | | | Merge branch 'flash-container-z-index' into 'master' Fatih Acet2016-09-241-2/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed z-index from flash container ## What does this MR do? Fixes a styling bug where the flash container would be above the header when scrolling. Before it looked like this when scrolling: ![Screen_Shot_2016-09-08_at_14.06.36](/uploads/d639287329643d26454a997e3917bc53/Screen_Shot_2016-09-08_at_14.06.36.png) Now it looks like this when scrolling: ![Screen_Shot_2016-09-08_at_14.07.37](/uploads/7c1c5e38adc9b9011558d4190d3520fe/Screen_Shot_2016-09-08_at_14.07.37.png) ## Are there points in the code the reviewer needs to double check? I can't think of any good reason why this would need to be above another element. But you never know! Closes #20713 See merge request !6264
| | * | | | Removed z-index from flash containerflash-container-z-indexPhil Hughes2016-09-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes styling error where the flash container would end up above the header when scrolling
| * | | | | Merge branch ↵Fatih Acet2016-09-241-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-svg-instead-of-container' into 'master' Fixed pipeline stage svg link tooltip ## What does this MR do? Adds `display: block` to the `.stage-container` class which allows the dimensional constraints of the link to be calculated correctly so the `mouseover` events are fired correctly. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Hovering the stage icons to reveal their SVG was buggy and would flash. ## Screenshots (if relevant) ![2016-09-23_14.59.17](/uploads/ad4c85fb08f032cc3f5d17749d3f7091/2016-09-23_14.59.17.gif) I just realised that Gifox actually adds its own mouse that isn't positioned or sized correctly so this doesn't look right, you'll have to `checkout` to confirm. /cc @dimitrieh I found a con about Gifox! :laughing: ## 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? Closes #22459 See merge request !6494
| | * | | | | Changed links that wrap the icon svg to `display: block` so there isn't any ↵22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-svg-instead-of-containerLuke Bennett2016-09-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | issues knowing when `mouseover` occurs
| * | | | | | Merge branch 'fix/memory-leak-sanitization-filter' into 'master' Yorick Peterse2016-09-232-32/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST See merge request !6456
| | * | | | | | Fix the leak mentioned in 504a3b5 by another wayAhmad Sherif2016-09-232-29/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix introduced another leak; as it made Banzai::Filter::SanitizationFiler#customized? always return false, so we were always appending two elements to HTML::Pipeline::SanitizationFilter::WHITELIST[:elements]. This growth in the elements array would slow the sanitization process over time.
| | * | | | | | Revert "Fix a memory leak caused by Banzai::Filter::SanitizationFilter"Ahmad Sherif2016-09-231-3/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 504a3b5e6f0b2e2957cf1e4d9d8eebbf32234bdb.
| * | | | | | Merge branch 'zj-link-broadcast-api-docs' into 'master' Robert Speicher2016-09-231-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to broadcast messages docs [ci skip] See merge request !6495
| | * | | | | | Add link to broadcast messages docsZ.J. van de Weg2016-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22508 [ci skip]
| * | | | | | | Merge branch 'fix/database-seeds' into 'master' Rémy Coutable2016-09-234-18/+28
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix database seeds for development environment ## What does this MR do? This MR fixes database seeds for development environment and adds CI test for it. ## Why was this MR needed? Database seeds for development environment are often broken, and we are not able to catch that when someone modified `db/fixtures` and forgets to reseed database. Closes #22422 See merge request !6475
| | * | | | | | Remove use of `USE_DB` environment variable in codefix/database-seedsGrzegorz Bizon2016-09-231-3/+1
| | | | | | | |
| | * | | | | | Limit test environment size to one project in CIGrzegorz Bizon2016-09-232-10/+5
| | | | | | | |
| | * | | | | | Update `CurrentSettings` class that uses ENVGrzegorz Bizon2016-09-221-1/+1
| | | | | | | |
| | * | | | | | Improve CI job that tests database seedsGrzegorz Bizon2016-09-221-4/+4
| | | | | | | |
| | * | | | | | Try cloning repositories before seeding databaseGrzegorz Bizon2016-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seeding database requires gitlab-shell, and we would like to avoid adding this dependency to the CI.
| | * | | | | | Add artifacts with development log when seed failsGrzegorz Bizon2016-09-221-0/+5
| | | | | | | |
| | * | | | | | Fix pipeline fixtures for development environmentGrzegorz Bizon2016-09-221-1/+1
| | | | | | | |
| | * | | | | | Add development environment database setup CI testGrzegorz Bizon2016-09-221-6/+16
| | | | | | | |
| * | | | | | | Fix CHANGELOG double-updateRémy Coutable2016-09-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-09-235-9/+25
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'fix/speed-up-group-milestone-show' into 'master' Yorick Peterse2016-09-235-10/+26
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up group milestones show page See merge request !6457
| | | * | | | | | | Update CHANGELOGfix/speed-up-group-milestone-showAhmad Sherif2016-09-231-2/+3
| | | | | | | | | |
| | | * | | | | | | Use select(:foo) instead of map(&:foo) in GlobalMilestoneAhmad Sherif2016-09-231-3/+3
| | | | | | | | | |
| | | * | | | | | | Ensure milestones passed to GlobalMilestone is an ActiveRecord::RelationAhmad Sherif2016-09-232-15/+7
| | | | | | | | | |
| | | * | | | | | | Reduce number of queries when calling GlobalMilestone#{labels,participants}Ahmad Sherif2016-09-232-2/+13
| | | | | | | | | |
| | | * | | | | | | Eager-load assignee and labels associations for GlobalMilestore issuablesAhmad Sherif2016-09-231-2/+2
| | | | | | | | | |