summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Do not escape URI when extracting path (!5878)winniehell2016-08-193-20/+4
| | | | | | | | |
| * | | | | | | | Add failing test for gitlab-com/support-forum#952winniehell2016-08-191-0/+10
| | | | | | | | |
* | | | | | | | | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-1915-51/+47
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show wall-clock time when showing pipeline ## What does this MR do? Show wall-clock time when showing pipeline instead of cumulative builds time. Closes #17007 See merge request !5734
| * | | | | | | | Now we already included it in spec_helper.rbwall-clock-time-for-showing-pipelineLin Jen-Shin2016-08-201-2/+0
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-2059-157/+624
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wall-clock-time-for-showing-pipeline * upstream/master: (50 commits) Increased vertical alignment of labels for issues in lists Changed file name Updated spec HAML Changed tests to use JS tests Addressed feedback Made logic simpler by moving away from underscorejs Added tooltip to label value in collapsed sidebar Add play icon SVG Have hover color of builds span full width Fix alignment of icon on commits page Change sleep to wait_for_ajax Added tests Destroy branch delete tooltip when row is removed Move and improvement comment in pipeline fixtures Fix notification_service argument error of declined invitation emails Update contribution acceptance criteria with tests requirements Fixed keyboard shortcuts not working on issue boards Hides tooltip when dragging Fixes issue with cursor not changing when dragging Hides tooltips when dragging issues Add a spec testing a second side effect of `Repository#merge`. drop execute bit ...
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-19378-891/+28649
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wall-clock-time-for-showing-pipeline * upstream/master: (554 commits) Fix expansion of discussions in diff Improve performance of MR show page Fix jumping between discussions on changes tab Update doorkeeper to 4.2.0 Fix MR note discussion ID Handle legacy sort order values Refactor `find_for_git_client` and its related methods. Remove right margin on Jump button icon Fix bug causing “Jump to discussion” button not to show Small refactor and syntax fixes. Removed unnecessary service for user retrieval and improved API error message. Added documentation and CHANGELOG item Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner Password Credentials flow. Fix behavior around commands with optional arguments Fix behavior of label_ids and add/remove_label_ids Remove unneeded aliases Do not expose projects on deployments Incorporate feedback Docs for API endpoints Expose project for environments ...
| * | | | | | | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-195-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5734#note_14056642
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-08-17201-834/+3556
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wall-clock-time-for-showing-pipeline * upstream/master: (99 commits) Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8 Updated Akismet documentation Add hover state to todos (!5361) Load issues and merge requests templates from repository Backport EE assertions in protected branch related specs. Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'" Fix a missed `before_action` for `AutocompleteController`. Backport `AutocompleteController#load_project` from EE!581. Fix API::BranchesSpec. Fix failing tests relating to backporting ee!581. Revert unrelevant changes Fix the protected branches factory. Improve EE compatibility with protected branch access levels. Move the "update" portion of the protected branch view into a partial. Don't select an access level if already selected. Backport changes from gitlab-org/gitlab-ee!581 to CE. Further refactor and syntax fixes. Upgrade httpclient gem from 2.7.0.1 to 2.8.2. Make rubocop happy Make rubocop happy ...
| * | | | | | | | | pipeline duration no longer depends on buildsLin Jen-Shin2016-08-151-2/+1
| | | | | | | | | |
| * | | | | | | | | Introduce Gitlab::Utils.now so that it's easier to stubLin Jen-Shin2016-08-154-7/+15
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/pipeline-hooks-without-slack' into ↵Lin Jen-Shin2016-08-1537-107/+465
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wall-clock-time-for-showing-pipeline * upstream/pipeline-hooks-without-slack: Make explicit call for all event types for ProjectHook factory Capitalise URL on web_hooks/form Remove changes not related to this MR Added documentation for pipeline hooks Rename queue to enqueue in tests Instrument Project.visible_to_user Fix build play failure Update ruby 2.3.1 Improve transition between states for event `enqueue` Use event `enqueue` instead of `queue` Fix test failures Fix bug where destroying a namespace would not always destroy projects Remove unused SpamReport model; this was renamed to SpamLog Corrected links/usernames in performance guide Add gravatars to build history Add deployment ID and gravatar to environments page Format environment history page Add avatar to commit message; environment style updates to match pipelines page Style deploy button
| * | | | | | | | | | Rename to total_duration and we're not using CommitStatus.durationLin Jen-Shin2016-08-153-9/+3
| | | | | | | | | | |
| * | | | | | | | | | We could just sum with SQLLin Jen-Shin2016-08-151-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Update duration for wall-clock timeLin Jen-Shin2016-08-151-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'pipeline-hooks-without-slack' into ↵Lin Jen-Shin2016-08-15452-5493/+7702
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wall-clock-time-for-showing-pipeline * pipeline-hooks-without-slack: (156 commits) Fix test failures Make pipeline to be in created state for hooks tests Make `execute_methods` public Added specs for started_at and finished_at Use explicit events to transition between states Fix tests. We cannot reload unless it's already saved: Have trait all_events_enabled so that's easier to reuse, feedback: Simplify the name for data builder, feedback: Prefer extend self over module_function, feedback: Make it more grammatically correct, feedback: if -> when; when -> `when`; %w() -> %w[]; and fix some typos: Prefer described_class, feedback: Make the comment more clear, feedback: Update CHANGELOG render only commit title Fix test failures, that did occur because of missing previously used `reload_status!` call Use state machine for pipeline event processing Upgrade Rails to 4.2.7.1 for security fixes. Update gitlab-shell to v3.3.3 Verify the pipeline status after executing events on builds ...
| * | | | | | | | | | | Cleanup the use of duration and optimize some queriesLin Jen-Shin2016-08-109-50/+39
| | | | | | | | | | | |
| * | | | | | | | | | | Add a changelog entryLin Jen-Shin2016-08-091-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Show wall-clock time when showing pipeline instead of:Lin Jen-Shin2016-08-094-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cumulative builds time. Closes #17007
* | | | | | | | | | | | Merge branch 'issue-boards-mobile-improvements' into 'master' Jacob Schatz2016-08-197-38/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to issue boards on mobile ## What does this MR do? - Removes the drag handles - Adds a delay before dragging can start otherwise you can't scroll the page See merge request !5897
| * | | | | | | | | | | Removed commented code :poop:issue-boards-mobile-improvementsPhil Hughes2016-08-192-26/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Improvements to issue boards on mobilePhil Hughes2016-08-197-38/+34
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-1944-65/+504
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
| * | | | | | | | | | | | Fix cron job keyexpiration-date-on-membershipsDouwe Maan2016-08-191-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-1977-139/+3631
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | | Add descriptionsDouwe Maan2016-08-183-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Don’t add events in loopDouwe Maan2016-08-181-19/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-1817-15/+222
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use `gl` namespace and explicitly check that string is emptyDouwe Maan2016-08-182-5/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix adding a user to a group in admin sectionSean McGivern2016-08-181-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-18111-290/+4007
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Allow project group links to be expiredSean McGivern2016-08-1816-25/+144
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Ensure last group owner isn't removed on expirySean McGivern2016-08-182-13/+48
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add expiration date to group membershipsSean McGivern2016-08-1814-34/+58
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-181067-9618/+37957
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add MemberExpirationDate JS helperSean McGivern2016-08-184-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
| * | | | | | | | | | | | | | | Only use let! where neededSean McGivern2016-08-181-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add MemberExpirationDate JS helperSean McGivern2016-08-185-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper adds a datepicker to all `js-access-expiration-date` elements. If that element is a child of a `clearable-input` element and has a sibling `js-clear-input` element, then it will show a working clear button to the right of the input field.
| * | | | | | | | | | | | | | | Create Member.expired scope.Adam Niedzielski2016-08-092-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use "is_a?" because it is more readable than checking the "type" field.Adam Niedzielski2016-08-091-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add CHANGELOG entry.Adam Niedzielski2016-08-071-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update API documentation.Adam Niedzielski2016-08-071-1/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Single quotes all the way.Adam Niedzielski2016-08-074-11/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove inline JavaScript. Add datepicker to the edit form.Adam Niedzielski2016-08-064-10/+13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add API support for expires_at.Adam Niedzielski2016-08-063-5/+18
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Set explicit time in tests so they return consistent results regardless of ↵Adam Niedzielski2016-08-061-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the hour of execution.
| * | | | | | | | | | | | | | | Allow to edit access expiration date.Adam Niedzielski2016-08-055-11/+26
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update spec for adding member.Adam Niedzielski2016-08-051-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Better presentation of member expiration.Adam Niedzielski2016-08-052-2/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Write test for RemoveExpiredMembersWorker.Adam Niedzielski2016-08-041-0/+25
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use Members::AuthorizedDestroyService in RemoveExpiredMembersWorker.Adam Niedzielski2016-08-041-2/+2
| | | | | | | | | | | | | | | |