summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOGgithub-avoid-conflicts-with-admin-labelsDouglas Barbosa Alexandre2016-09-081-0/+1
|
* Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-084-11/+39
|
* Merge branch 'support-long-branch-namers' into 'master' Annabel Dunstone Gray2016-09-082-3/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give project selection dropdowns responsive width, long names wrap. ## What does this MR do? Makes two dropdown menus (branch name selector & project selector) wider on larger screens, and allows their contents to wrap. ## Are there points in the code the reviewer needs to double check? Sanity check. ## Why was this MR needed? Considered a regression, as users who relied on long branch names could no longer see them fully. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-30_at_2.50.43_PM](/uploads/e0252cb02c5f34f3c777d2d67028042f/Screen_Shot_2016-08-30_at_2.50.43_PM.png) After: ![Screen_Shot_2016-08-30_at_2.49.35_PM](/uploads/b504e0f3e139c85699bc5aafb58199f3/Screen_Shot_2016-08-30_at_2.49.35_PM.png) After (updated after fixes, including project selector): ![Screen_Shot_2016-09-02_at_1.46.53_PM](/uploads/b480fc8193f713ce43518cb83886fd52/Screen_Shot_2016-09-02_at_1.46.53_PM.png) ![Screen_Shot_2016-09-02_at_1.50.26_PM](/uploads/f0d31702668e83e6c0c24782cc43fdbd/Screen_Shot_2016-09-02_at_1.50.26_PM.png) ## 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 - 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) ## What are the relevant issue numbers? Closes #15633 See merge request !6105
| * Give project selection dropdowns responsive width, long-names wrap.support-long-branch-namersBryce2016-09-022-3/+10
| |
* | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-086-6/+300
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smartly calculate real running time and pending time ## What does this MR do? Try to smartly calculate the running time and pending time for pipelines, instead of just use wall clock time from start to end. The algorithm is based on: > Suppose we have A, B, and C jobs: > * A: from 1 to 3 > * B: from 2 to 4 > * C: from 6 to 7 > The processing time should be accumulated from 1 to 4, and 6 to 7, totally 4, excluding retires, and calculate on `%w[success failed running canceled]` jobs (if a job is not finished yet, assume it's `Time.now`) ## Are there points in the code the reviewer needs to double check? I would actually like to test `Gitlab::Ci::PipelineDuration#process_segments`, but it's a private method right now and it's not very convenient to test it. Is there a way to test it without changing the original code too much? Note that I would like to avoid saving merged segments because it's not used and should be garbage collected. ## Screenshots: ![Screen_Shot_2016-09-05_at_6.45.32_PM](/uploads/a82bfaf316661091e383b743a2f11334/Screen_Shot_2016-09-05_at_6.45.32_PM.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) - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #18260, #19804 See merge request !6084
| * | Struct.new could take a block for defining methods, feedback:smart-pipeline-durationLin Jen-Shin2016-09-081-2/+1
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_15091858
| * | Split try_merge_period into overlap? and merge:Lin Jen-Shin2016-09-081-7/+9
| | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_15083507
| * | Just use string interpolation, feedback:Lin Jen-Shin2016-09-071-2/+1
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_15026132
| * | Be more specific since it's not needed to be generic now,Lin Jen-Shin2016-09-061-3/+5
| | | | | | | | | | | | | | | feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14995016
| * | Sort by database, feedback:Lin Jen-Shin2016-09-062-3/+5
| | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14991226 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14994233
| * | Just use module because there's nothing to save, feedback:Lin Jen-Shin2016-09-062-18/+14
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14992064
| * | Use sum, feedback:Lin Jen-Shin2016-09-061-3/+1
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14991392
| * | Also add an entry for showing queued time [ci skip]Lin Jen-Shin2016-09-051-0/+1
| | |
| * | Remove tests for pending_durationLin Jen-Shin2016-09-051-2/+1
| | |
| * | Show how long this pipeline was queuedLin Jen-Shin2016-09-052-0/+10
| | | | | | | | | | | | Closes #19804
| * | Forget about pending duration for now, need more discussionLin Jen-Shin2016-09-054-49/+11
| | |
| * | Just sum all the queuing time, indication for needing more runnersLin Jen-Shin2016-09-022-7/+8
| | |
| * | Make sure the algorithm did exclude gapsLin Jen-Shin2016-09-021-2/+2
| | |
| * | Actually we still need to use total - running to get:Lin Jen-Shin2016-09-022-9/+15
| | | | | | | | | | | | | | | | | | real pending time, because that's actually by definition, (the time that it's not running!) or we could end up with awfully complicated algorithm :(
| * | Update schema for pending_durationLin Jen-Shin2016-09-021-0/+1
| | |
| * | Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-02308-2205/+5306
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (289 commits) Fix a typo Change minimum Unicorns required to two Update memory requirements Change the inline code to codeblocks for the new features doc guideline Update CHANGELOG with 8.11.4 entries. removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop' Change widths of content in MR pipeline tab Add curve to generic commit status pipeline Rubocop syntax 2.3 Some minor updates for upgrade guides for 8.12. Remove inconsistent font weight for sidebar's labels Replace play icon font with svg Project tools visibility level Added todo filter tests Fixed project filtering Review changes, simplified dropdown init Removed select2 from todos feature spec Removed inline JS and improved dropdown labels Added type and action dropdowns, need to finalize by removing all inline and polishing off the selected dropdown states Completed project filter dropdown, still need to move it from inline to ProjectSelect.js (or different) ...
| * | Calculate real queueing time to exclude gaps from:Lin Jen-Shin2016-09-024-38/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | retries and probably also manual actions! Feedback: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14735478 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14737804
| * | Use guard clause, feedback:Lin Jen-Shin2016-08-311-11/+9
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14754681
| * | Introduction to PipelineDurationLin Jen-Shin2016-08-311-0/+98
| | |
| * | Add CHANGELOG entryLin Jen-Shin2016-08-311-0/+1
| | |
| * | It's renamed to periodsLin Jen-Shin2016-08-311-2/+2
| | |
| * | Add test cases from:Lin Jen-Shin2016-08-301-0/+28
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14709761
| * | Fix renamingLin Jen-Shin2016-08-301-1/+1
| | |
| * | Avoid shadowing method name. Just use existing methodLin Jen-Shin2016-08-301-2/+2
| | |
| * | Rename to periods since it's easier to understandLin Jen-Shin2016-08-302-23/+23
| | |
| * | Use algorithm from Kamil:Lin Jen-Shin2016-08-301-28/+9
| | | | | | | | | | | | | | | Excluding sorting, this is O(n) which should be much faster and much simpler and easier to understand.
| * | Fix test for Pipeline#durationLin Jen-Shin2016-08-301-5/+17
| | |
| * | build might not start yetLin Jen-Shin2016-08-301-1/+1
| | |
| * | no builds no pendingLin Jen-Shin2016-08-291-0/+2
| | |
| * | no point to set duration while not started yetLin Jen-Shin2016-08-291-0/+2
| | |
| * | Fix constant nameLin Jen-Shin2016-08-291-1/+1
| | |
| * | I prefer to have empty lines around constants thoughLin Jen-Shin2016-08-291-1/+0
| | |
| * | Smartly calculate real running time and pending timeLin Jen-Shin2016-08-294-1/+200
| | |
* | | Merge branch 'pipeline-hooks' into 'master' Rémy Coutable2016-09-088-50/+265
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Slack integration for pipeline hooks ## What does this MR do? Add pipeline events to Slack integration ## 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) - Tests - [x] Added for this feature/bug See merge request !5525
| * | | Remove redundant tests, feedback:pipeline-hooksLin Jen-Shin2016-09-062-24/+0
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5525#note_14993999
| * | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-09-06455-3288/+7214
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (368 commits) Don't fail on an empty database Refactor authorization_for_merge_requests.md Support MySQL too, when removing gitorious from import_sources Remove gitorious from import_sources on ApplicationSetting model Add links to new docs in merge_requests.md and workflow/README.md Move merge request versions to its own document Move "Only allow merge requests to be merged if the build succeeds" to new location Move revert_changes.md to new location Move cherry_pick_changes.md to new location Move `wip_merge_requests.md` to a new location Move merge_when_build_succeeds.md to new location Fix missing flash messages on service edit page Move authorization_for_merge_requests.md to new location Move `workflow/merge_requests.md` to `user/project/merge_requests.md` Update README.md Fix randomly failing specs in expand_collapse_diff_spec: Add link on API docs index page Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 Remove suggested colors hover underline Fix markdown anchor icon interaction ...
| * | | | Not sure why there's an extra one!?Lin Jen-Shin2016-08-291-7/+0
| | | | |
| * | | | I am too used to have no spaces around default argsLin Jen-Shin2016-08-292-2/+2
| | | | |
| * | | | Use a completely fake webhook URL, feedback:Lin Jen-Shin2016-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5525#note_14665966
| * | | | empty lines between blocksLin Jen-Shin2016-08-291-1/+1
| | | | |
| * | | | pipeline/build succeeded/failed, feedback:Lin Jen-Shin2016-08-292-4/+4
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5525#note_14664613
| * | | | Shorten the line and use methods, feedback:Lin Jen-Shin2016-08-292-12/+21
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5525#note_14664637
| * | | | somewhere -> example.gitlab, feedback:Lin Jen-Shin2016-08-292-8/+8
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5525#note_14664661
| * | | | Empty line between message =, feedback:Lin Jen-Shin2016-08-292-3/+9
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5525#note_14664714
| * | | | Fix CHANGELOGLin Jen-Shin2016-08-261-2/+0
| | | | |
View Lorry Controller Status