Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'remove-wip' into 'master' | Jacob Schatz | 2016-03-19 | 1 | -18/+10 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' into remove-wip | Rémy Coutable | 2016-03-18 | 172 | -1176/+4171 |
| |\ | |||||
| * | | Improve the "easy WIP & un-WIP from link" feature | Rémy Coutable | 2016-03-18 | 1 | -18/+10 |
* | | | Merge branch 'label-tooltip' into 'master' | Douwe Maan | 2016-03-19 | 2 | -3/+11 |
|\ \ \ | |||||
| * | | | Fix specslabel-tooltip | Rémy Coutable | 2016-03-18 | 2 | -3/+11 |
* | | | | Merge branch 'issue-branch-iid-postfix' into 'master' | Douwe Maan | 2016-03-19 | 1 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | \#to_branch_name now uses the iid as postfixissue-branch-iid-postfix | Zeger-Jan van de Weg | 2016-03-18 | 1 | -3/+3 |
* | | | | Merge branch 'no-gc-retry' into 'master' | Robert Speicher | 2016-03-18 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix HousekeepingService testsno-gc-retry | Jacob Vosmaer | 2016-03-18 | 1 | -2/+2 |
* | | | | | Add a safeguard in MergeRequest#compute_diverged_commits_count | Rémy Coutable | 2016-03-18 | 1 | -0/+22 |
| |/ / / |/| | | | |||||
* | | | | Refactor `Todo#target` | Douglas Barbosa Alexandre | 2016-03-18 | 1 | -7/+17 |
* | | | | Rename `Todo#to_reference` to `Todo#target_reference` | Douglas Barbosa Alexandre | 2016-03-18 | 1 | -3/+3 |
* | | | | Use `Commit#short_id` instead of `Commit.truncate_sha` | Douglas Barbosa Alexandre | 2016-03-18 | 1 | -1/+3 |
* | | | | Update schema info comment on todo related files | Douglas Barbosa Alexandre | 2016-03-18 | 2 | -4/+6 |
* | | | | Use todo.done without ! in the controller to mark todo as done | Douglas Barbosa Alexandre | 2016-03-18 | 1 | -3/+3 |
* | | | | Trigger a todo for mentions on commits page | Douglas Barbosa Alexandre | 2016-03-18 | 3 | -3/+73 |
* | | | | Merge branch 'fix-mr-source-sha' into 'master' | Douwe Maan | 2016-03-18 | 2 | -0/+30 |
|\ \ \ \ | |||||
| * | | | | Fix MergeRequest#source_sha when there is no diff | Pierre de La Morinerie | 2016-03-16 | 2 | -0/+12 |
| * | | | | Add tests for MergeRequest#source_sha | Pierre de La Morinerie | 2016-03-16 | 1 | -0/+18 |
* | | | | | Merge branch 'issue-fade-load' into 'master' | Jacob Schatz | 2016-03-18 | 1 | -2/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed issue with dashboard issues not reloading | Phil Hughes | 2016-03-18 | 1 | -2/+0 |
* | | | | | | Merge branch 'confidential-issues' into 'master' | Douwe Maan | 2016-03-18 | 18 | -28/+751 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Restrict access to confidential issues on activity feed | Douglas Barbosa Alexandre | 2016-03-17 | 1 | -0/+36 |
| * | | | | | | Restrict access for confidential issues on milestone view | Douglas Barbosa Alexandre | 2016-03-17 | 2 | -10/+114 |
| * | | | | | | Restrict access to confidential issues on search results | Douglas Barbosa Alexandre | 2016-03-17 | 2 | -3/+157 |
| * | | | | | | Restrict access to confidential issues through API | Douglas Barbosa Alexandre | 2016-03-17 | 1 | -2/+110 |
| * | | | | | | Restrict access for confidential issues on autocomplete | Douglas Barbosa Alexandre | 2016-03-17 | 1 | -0/+79 |
| * | | | | | | Restrict access to references for confidential issues | Douglas Barbosa Alexandre | 2016-03-17 | 9 | -5/+97 |
| * | | | | | | Restrict access to confidential issues | Douglas Barbosa Alexandre | 2016-03-17 | 2 | -8/+158 |
* | | | | | | | Show a notice for diffs that are too largehide-large-diffs | Yorick Peterse | 2016-03-18 | 1 | -0/+14 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Added tests for Repository#build_cacheproject-cache-worker-without-diverging | Yorick Peterse | 2016-03-17 | 1 | -0/+30 |
|/ / / / / | |||||
* | | | | | Cache project avatars stored in Git | Yorick Peterse | 2016-03-17 | 2 | -5/+85 |
* | | | | | Merge branch 'glalonde-triggerbuild' into 'master' | Kamil Trzciński | 2016-03-17 | 1 | -0/+23 |
|\ \ \ \ \ | |||||
| * | | | | | adjusted behavior so canceled builds tagged as allowed to fail do not fail build | Geoffrey Lalonde | 2016-03-17 | 1 | -0/+23 |
| |/ / / / | |||||
* | | | | | Merge branch '4009-external-users' into 'master' | Douwe Maan | 2016-03-17 | 6 | -33/+161 |
|\ \ \ \ \ | |||||
| * | | | | | API support for setting External flag on existing users | Zeger-Jan van de Weg | 2016-03-17 | 1 | -0/+7 |
| * | | | | | Merge branch 'master' into 4009-external-users4009-external-users | Zeger-Jan van de Weg | 2016-03-15 | 25 | -148/+570 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into 4009-external-users | Zeger-Jan van de Weg | 2016-03-14 | 8 | -4/+217 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Create an external users tab on Admin user list | Zeger-Jan van de Weg | 2016-03-13 | 3 | -1/+38 |
| * | | | | | | | External Users | Zeger-Jan van de Weg | 2016-03-13 | 6 | -33/+117 |
* | | | | | | | | Fix specs | Zeger-Jan van de Weg | 2016-03-17 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'master' into new-branch-button-issue | Zeger-Jan van de Weg | 2016-03-17 | 7 | -12/+109 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Fix wiki search results point to raw source | Hiroyuki Sato | 2016-03-17 | 1 | -1/+17 |
| | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'issue_14306' into 'master' | Robert Speicher | 2016-03-16 | 1 | -0/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Return an empty Array when there aren't lines to parse. | Rubén Dávila | 2016-03-15 | 1 | -0/+5 |
| * | | | | | | | Merge branch 'worker-for-user-deletion' into 'master' | Douwe Maan | 2016-03-16 | 3 | -9/+85 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Specs for the DeleteUserServiceworker-for-user-deletion | Zeger-Jan van de Weg | 2016-03-15 | 2 | -49/+69 |
| | * | | | | | | Clearify who deletes the user | Zeger-Jan van de Weg | 2016-03-15 | 2 | -4/+5 |
| | * | | | | | | Fix broken specs | Zeger-Jan van de Weg | 2016-03-15 | 1 | -9/+6 |
| | * | | | | | | Target right release, rebase got it wrong | Zeger-Jan van de Weg | 2016-03-15 | 1 | -2/+2 |