Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed large comments messing with diff table widthsdiff-table-width-fix | Phil Hughes | 2016-09-12 | 1 | -4/+5 |
* | Merge branch '21814-fix' into 'master' | Robert Speicher | 2016-09-10 | 1 | -1/+1 |
|\ | |||||
| * | Pull import sources from Gitlab::ImportSources | Ojas Shirekar | 2016-09-09 | 1 | -1/+1 |
* | | Merge branch 'enable-pipeline-events-by-default' into 'master' | Robert Speicher | 2016-09-09 | 1 | -0/+1 |
|\ \ | |||||
| * | | Enable pipeline events by defaultenable-pipeline-events-by-default | Lin Jen-Shin | 2016-09-09 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'add-remember-option-u2f' into 'master' | Robert Speicher | 2016-09-09 | 3 | -2/+4 |
|\ \ | |||||
| * | | Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2f | DJ Mountney | 2016-09-01 | 3 | -2/+4 |
* | | | Merge branch 'branches-mr-button-permissions' into 'master' | Robert Speicher | 2016-09-09 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | Hides merge request button on branches pagebranches-mr-button-permissions | Phil Hughes | 2016-09-02 | 1 | -2/+3 |
* | | | | Merge branch '20300-restore-comments' into 'master' | Jacob Schatz | 2016-09-09 | 75 | -62/+757 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Require comments must be included before code | Jared Deckard | 2016-09-08 | 1 | -3/+0 |
| * | | | Restore comments lost when converting CoffeeScript to JavaScript | Jared Deckard | 2016-09-08 | 75 | -62/+760 |
* | | | | Merge branch 'gitlab-workhorse-safeties' into 'master' | Jacob Vosmaer (GitLab) | 2016-09-09 | 4 | -8/+14 |
|\ \ \ \ | |||||
| * | | | | Verify JWT messages from gitlab-workhorse | Jacob Vosmaer | 2016-09-05 | 4 | -8/+14 |
* | | | | | Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into... | Rémy Coutable | 2016-09-09 | 2 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Refresh todos count cache when an Issue/MR is deleted | Douglas Barbosa Alexandre | 2016-09-08 | 2 | -0/+22 |
* | | | | | | Merge branch 'sidekiq-ps-parsing' into 'master' | Rémy Coutable | 2016-09-09 | 2 | -6/+21 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Remove original regexp | Pascal Betz | 2016-09-08 | 1 | -9/+7 |
| * | | | | | Reformat Regexp | Pascal Betz | 2016-09-08 | 2 | -3/+13 |
| * | | | | | feedback code review | Pascal Betz | 2016-09-08 | 2 | -2/+2 |
| * | | | | | Move parsing of sidekiq ps into helper | Pascal Betz | 2016-09-07 | 2 | -8/+15 |
* | | | | | | Merge branch 'support-long-branch-namers' into 'master' | Annabel Dunstone Gray | 2016-09-08 | 1 | -3/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Give project selection dropdowns responsive width, long-names wrap.support-long-branch-namers | Bryce | 2016-09-02 | 1 | -3/+9 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'smart-pipeline-duration' into 'master' | Rémy Coutable | 2016-09-08 | 2 | -1/+12 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Just use string interpolation, feedback: | Lin Jen-Shin | 2016-09-07 | 1 | -2/+1 |
| * | | | | | Show how long this pipeline was queued | Lin Jen-Shin | 2016-09-05 | 2 | -0/+10 |
| * | | | | | Forget about pending duration for now, need more discussion | Lin Jen-Shin | 2016-09-05 | 1 | -2/+1 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into smart-pipeline-duration | Lin Jen-Shin | 2016-09-02 | 149 | -1268/+1725 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Calculate real queueing time to exclude gaps from: | Lin Jen-Shin | 2016-09-02 | 1 | -7/+2 |
| * | | | | | no point to set duration while not started yet | Lin Jen-Shin | 2016-08-29 | 1 | -0/+2 |
| * | | | | | Fix constant name | Lin Jen-Shin | 2016-08-29 | 1 | -1/+1 |
| * | | | | | Smartly calculate real running time and pending time | Lin Jen-Shin | 2016-08-29 | 1 | -1/+7 |
* | | | | | | Merge branch 'pipeline-hooks' into 'master' | Rémy Coutable | 2016-09-08 | 3 | -26/+129 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-hooks | Lin Jen-Shin | 2016-09-06 | 212 | -1693/+2262 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Not sure why there's an extra one!? | Lin Jen-Shin | 2016-08-29 | 1 | -7/+0 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooks | Lin Jen-Shin | 2016-08-26 | 51 | -363/+379 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix caption | Lin Jen-Shin | 2016-08-24 | 1 | -1/+1 |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooks | Lin Jen-Shin | 2016-08-24 | 471 | -2473/+9946 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into pipeline-hooks | Lin Jen-Shin | 2016-08-02 | 60 | -323/+635 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Slack pipeline events test and fix some issues along the way | Lin Jen-Shin | 2016-08-01 | 2 | -12/+18 |
| * | | | | | | | | | | Reduce complexity by extracting it to a method | Lin Jen-Shin | 2016-07-30 | 1 | -17/+20 |
| * | | | | | | | | | | Add pipeline_events to Slack service: | Lin Jen-Shin | 2016-07-30 | 4 | -10/+106 |
| * | | | | | | | | | | Fix that tricky side-effect issue in the test | Lin Jen-Shin | 2016-07-29 | 1 | -1/+1 |
| * | | | | | | | | | | It was never used | Lin Jen-Shin | 2016-07-29 | 1 | -2/+2 |
| * | | | | | | | | | | Don't execute hooks if ci was supposed to be skipped | Lin Jen-Shin | 2016-07-29 | 1 | -2/+3 |
| * | | | | | | | | | | Also touch the pipeline so we could just hook into update_state | Lin Jen-Shin | 2016-07-29 | 2 | -6/+8 |
| * | | | | | | | | | | We're not using original hash anyway, we could use it | Lin Jen-Shin | 2016-07-29 | 1 | -1/+1 |
| * | | | | | | | | | | Add views for pipeline events | Lin Jen-Shin | 2016-07-29 | 2 | -1/+8 |
| * | | | | | | | | | | WIP, initial work to implement pipeline hooks: | Lin Jen-Shin | 2016-07-29 | 5 | -0/+10 |
* | | | | | | | | | | | Merge branch 'dz-bulk-edit-mr' into 'master' | Rémy Coutable | 2016-09-08 | 16 | -80/+97 |
|\ \ \ \ \ \ \ \ \ \ \ |