summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Call `set_discussion_id` again in DiffNote `before_validation` because the or...fix-diff-note-discussion-idDouwe Maan2016-08-194-1/+29
* Merge branch 'mark-as-processable' into 'master' Robert Speicher2016-08-194-3/+52
|\
| * Fix rubocop offense in pipeline modelmark-as-processableGrzegorz Bizon2016-08-191-1/+1
| * Fix test for processing pipeline after retrying buildGrzegorz Bizon2016-08-191-1/+1
| * Add test that shows problem with pipeline processingGrzegorz Bizon2016-08-191-3/+43
| * Make all future skipped builds as processable when retrying a buildKamil Trzcinski2016-08-183-0/+9
* | Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-af...Douwe Maan2016-08-192-8/+32
|\ \
| * | Don't log to STDOUT in specs21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-pushSean McGivern2016-08-191-0/+1
| * | Fix force-push message in push emailsSean McGivern2016-08-192-8/+31
* | | Merge branch 'fix-discussions-on-changed-lines' into 'master' Robert Speicher2016-08-195-1/+14
|\ \ \
| * | | Fix bug where notes weren’t shown in discussion when the code had changed a...Douwe Maan2016-08-195-1/+14
* | | | Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher2016-08-193-17/+26
|\ \ \ \
| * | | | Fix JSON schema to issues in issue board listsissue-boards-label-text-colorDouglas Barbosa Alexandre2016-08-191-16/+24
| * | | | Added text color to issues labels in issue board listsPhil Hughes2016-08-192-1/+2
| | |/ / | |/| |
* | | | Merge branch 'directory-names-containing-space' into 'master' Robert Speicher2016-08-193-20/+14
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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 wall-clock-time-for-showi...Lin Jen-Shin2016-08-2059-157/+624
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-19378-891/+28649
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-195-12/+10
| * | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-17201-834/+3556
| |\ \ \ \ \
| * | | | | | 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 wal...Lin Jen-Shin2016-08-1537-107/+465
| |\ \ \ \ \ \
| * | | | | | | 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 wall-clock-time-for-showing-...Lin Jen-Shin2016-08-15452-5493/+7702
| |\ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | | Merge branch 'issue-boards-mobile-improvements' into 'master' Jacob Schatz2016-08-197-38/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | 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