summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-26145-750/+1721
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (107 commits) Fix external issue tracker "Issues" link leading to 404s Fix CHANGELOG entries related to 8.11 release. Fix changelog Reduce contributions calendar data payload Add lock_version to merge_requests table Add hover color to emoji icon Fix wrong Koding link Capitalize mentioned issue timeline notes Fix groups sort dropdown alignment Use icon helper Fix inline emoji text alignment Adds response mime type to transaction metric action when it's not HTML Moved two 8.11 changelog entries to 8.12 Fix markdown link in doc_styleguide.md Display project icon from default branch Reduce number of database queries on builds tab Update CHANGELOG Update Issue board documentation Label list shows all issues (opened or closed) with that label Update CHANGELOG ...
| * | | | | | | | | | | Remove old stuffsLin Jen-Shin2016-08-243-101/+2
| | | | | | | | | | | |
| * | | | | | | | | | | No longer neededLin Jen-Shin2016-08-241-4/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fix spacingLin Jen-Shin2016-08-241-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fix captionLin Jen-Shin2016-08-241-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix CHANGELOGLin Jen-Shin2016-08-241-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-241281-10057/+47575
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1174 commits) Added CHANGELOG Added unfold test to parallel and added 'diff discussion' context Fix Spinach branches spec Better first match on this MR also Change merge_error column from string to text type Fix typo in gitlab_flow.md entities: make Environment inherit EnvironmentBasic Updated to optimized specs from !5864 Added 'with an unfolded line should not allow commenting' scenario (line 125) Added addtional 'renderable' validator to check 'data-note-type' attr exists Allow passing an index to selectRowAtIndex Fixed enter key in search input not working Fix file links on project page Files view Fix incorrect "stopped impersonation" log message 8.11 is released, long live 8.12 Also check if Akismet is enabled, before showing the `Submit as spam` button. fix location of markdown help location Fix for update 8.10-to-8.11.md doc. Appease the linter. Add Ruby 2.3 upgrade notes. ...
| * | | | | | | | | | | | Update CHANGELOG due to the introduction of !5620Lin Jen-Shin2016-08-021-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into pipeline-hooksLin Jen-Shin2016-08-02182-1173/+3755
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (145 commits) Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586) Add failing tests for #19028 Update installation guide for 8.11 Update CHANGELOG for 8.10.3 Catch what warden might throw when profiling requests to re-throw it webhooks: include old revision in MR update events Fix search results for notes without commits API methods should be documented using Grape's DSL Update CHANGELOG Fix RequestProfiler::Middleware error when code is reloaded in development Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration Fix specs Trim extra displayed carriage returns in diffs and files with CRLFs Avoid line_code and position calculation on line partial for plain view State specific default sort order for issuables refactored wait_for_archived_file method squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit fix return value and spec squashed - fix timing issues in prod importing projects Minor fixes in the Env API endpoints ...
| * | | | | | | | | | | | | Add a CHANGELOG entry for pipeline eventsLin Jen-Shin2016-08-011-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add test for running hooks for pipeline after touchedLin Jen-Shin2016-08-011-2/+31
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add API tests for pipeline_eventsLin Jen-Shin2016-08-011-2/+5
| | | | | | | | | | | | | |