Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'task_list_refactor' into 'master' | Fatih Acet | 2017-02-17 | 8 | -102/+80 |
|\ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactor | Simon Knox | 2017-02-16 | 290 | -3237/+7515 |
| |\ | |||||
| * | | update correct field for Notes - it's called note not description | Simon Knox | 2017-02-15 | 4 | -1/+5 |
| * | | code style and test fixes | Simon Knox | 2017-02-14 | 3 | -4/+4 |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor | Simon Knox | 2017-02-14 | 12 | -61/+127 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor | Simon Knox | 2017-02-14 | 726 | -12683/+10149 |
| |\ \ \ | |||||
| * | | | | enable lint | Simon Knox | 2017-02-10 | 1 | -4/+1 |
| * | | | | add changelog item | Simon Knox | 2017-02-09 | 1 | -0/+4 |
| * | | | | update karma test to expect ajax instead of POST | Simon Knox | 2017-02-09 | 1 | -8/+6 |
| * | | | | forgot to iife | Simon Knox | 2017-02-08 | 1 | -1/+1 |
| * | | | | notes use new task_list, and PATCH instead of POST | Simon Knox | 2017-02-08 | 5 | -24/+18 |
| * | | | | appease lint | Simon Knox | 2017-02-08 | 1 | -9/+8 |
| * | | | | switch notes to use task_list, but keep its update function for now | Simon Knox | 2017-02-08 | 2 | -19/+14 |
| * | | | | copypaste task_list setup and events to own class | Simon Knox | 2017-02-07 | 3 | -66/+53 |
* | | | | | Merge branch '28236-browse-button-dropping' into 'master' | Fatih Acet | 2017-02-17 | 2 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Increase right side of file header to accommodate browse files button28236-browse-button-dropping | Annabel Dunstone Gray | 2017-02-16 | 2 | -1/+5 |
* | | | | | | Merge branch '27920-both-wip-messages-showing' into 'master' | Fatih Acet | 2017-02-17 | 4 | -1/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showing | Sam Rose | 2017-02-14 | 4 | -1/+8 |
* | | | | | | | Merge branch '28303-change-development-tanuki-favicon-colors-to-match-logo' i... | Annabel Dunstone Gray | 2017-02-17 | 2 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change development tanuki favicon colors to match logo color order28303-change-development-tanuki-favicon-colors-to-match-logo | dimitrieh | 2017-02-17 | 2 | -0/+4 |
* | | | | | | | | Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master' | Rémy Coutable | 2017-02-17 | 3 | -112/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move dashboard issues spinach test to Rspec | Semyon Pupkov | 2017-02-10 | 3 | -112/+48 |
* | | | | | | | | | Merge branch 'issue_26714' into 'master' | Rémy Coutable | 2017-02-17 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix 'reset-email' link specissue_26714 | Felipe Artur | 2017-02-16 | 1 | -2/+4 |
* | | | | | | | | | | Merge branch '27605-research-proposal-template' into 'master' | Annabel Dunstone Gray | 2017-02-17 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 27605 Add research proposal to issue templates27605-research-proposal-template | tauriedavis | 2017-02-16 | 1 | -0/+17 |
* | | | | | | | | | | | Merge branch 'paginate-all-the-things' into 'master' | Rémy Coutable | 2017-02-17 | 66 | -87/+1194 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Backport API to v3paginate-all-the-things | Robert Schilling | 2017-02-17 | 17 | -1/+807 |
| * | | | | | | | | | | | Add a custom pagination matcher | Robert Schilling | 2017-02-16 | 33 | -36/+274 |
| * | | | | | | | | | | | Paginate all endpoints that return an array | Robert Schilling | 2017-02-16 | 21 | -51/+114 |
* | | | | | | | | | | | | Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master' | Kamil Trzciński | 2017-02-17 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remove legacy GitlabCi module from initializersfix/gb/remove-gitlab-ci-module | Grzegorz Bizon | 2017-02-15 | 1 | -8/+0 |
* | | | | | | | | | | | | | Merge branch 'fix/gb/pipeline-retry-cancel-buttons-consistency' into 'master' | Kamil Trzciński | 2017-02-17 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add Changelog entry for pipeline buttons fixfix/gb/pipeline-retry-cancel-buttons-consistency | Grzegorz Bizon | 2017-02-14 | 1 | -0/+4 |
| * | | | | | | | | | | | | | Reuse pipeline methods to preserve Law of Demeter | Grzegorz Bizon | 2017-02-14 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge branch '26500-informative-slack-notifications' into 'master' | Kamil Trzciński | 2017-02-17 | 11 | -17/+122 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Adding links to user & build in Chat Notifications | Poornima M | 2017-01-25 | 11 | -17/+122 |
* | | | | | | | | | | | | | | | Merge branch 'use-update-runner-service' into 'master' | Kamil Trzciński | 2017-02-17 | 10 | -16/+259 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Use expect { }.to change { }use-update-runner-service | Lin Jen-Shin | 2017-02-15 | 2 | -18/+18 |
| * | | | | | | | | | | | | | | | Add some tests for admin/project runners page | Lin Jen-Shin | 2017-02-15 | 2 | -0/+160 |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into use-update-runner-service | Lin Jen-Shin | 2017-02-15 | 855 | -15237/+17772 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add a test to make sure the queue ticks when updating runners | Lin Jen-Shin | 2017-02-13 | 1 | -0/+7 |
| * | | | | | | | | | | | | | | | Use UpdateRunnerService to update runner in API: | Lin Jen-Shin | 2017-02-08 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | Only tick queue if anything is updated | Lin Jen-Shin | 2017-02-07 | 2 | -6/+29 |
| * | | | | | | | | | | | | | | | Just pass :services, feedback: | Lin Jen-Shin | 2017-02-07 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into use-update-runner-service | Lin Jen-Shin | 2017-02-07 | 581 | -4174/+15766 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | No need to tick the queue when creating the runner | Lin Jen-Shin | 2017-02-04 | 1 | -12/+8 |
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into use-update-runner-service | Lin Jen-Shin | 2017-02-04 | 1274 | -5272/+13562 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Remove the key from the queue when runner is deleted | Lin Jen-Shin | 2017-01-21 | 2 | -0/+27 |
| * | | | | | | | | | | | | | | | | | Prefer service object over after_save hook | Lin Jen-Shin | 2017-01-21 | 7 | -23/+52 |