summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'capitalize-mentioned-issue-notes' into 'master' Douwe Maan2016-08-261-1/+1
|\
| * Capitalize mentioned issue timeline notesClement Ho2016-08-251-1/+1
* | Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-0/+13
|\ \
| * | Don't show conflicts when there are noneSean McGivern2016-08-251-0/+6
| * | Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-0/+7
* | | Merge branch 'statuseable-hasstatus' into 'master' Robert Speicher2016-08-251-3/+3
|\ \ \
| * | | rename Statuseable to HasStatusDe Wet Blomerus2016-08-251-3/+3
| |/ /
* | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-252-13/+56
|\ \ \ | |_|/ |/| |
| * | Add code improvements to merge request version featureDmitriy Zaporozhets2016-08-251-0/+9
| * | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-221-3/+3
| * | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-227-10/+106
| |\ \
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1928-66/+1695
| |\ \ \
| * | | | Fix merge request diffs specDmitriy Zaporozhets2016-08-151-1/+1
| * | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-151-6/+7
| * | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1549-575/+778
| |\ \ \ \
| * | | | | Add MergeRequest#branch_merge_base_commit methodDmitriy Zaporozhets2016-08-081-0/+17
| * | | | | Fix merge request spec for update diff noteDmitriy Zaporozhets2016-08-021-0/+2
| * | | | | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-021-9/+3
| * | | | | Change merge request diff creation from callback to part of the serviceDmitriy Zaporozhets2016-08-021-1/+2
| * | | | | Add more tests to merge_request_diff and improve initializeDmitriy Zaporozhets2016-08-021-0/+17
| * | | | | Reload merge request association reload when update codeDmitriy Zaporozhets2016-08-021-3/+2
| * | | | | Improve merge request diff creation and update testsDmitriy Zaporozhets2016-08-021-12/+16
* | | | | | Display project icon from default branchHannes Rosenögger2016-08-251-0/+31
| |_|_|_|/ |/| | | |
* | | | | Show "Create Merge Request" widget for push events to fork projects on the so...Paco Guzman2016-08-241-0/+10
| |_|_|/ |/| | |
* | | | Fix Error 500 resulting when loading network graphfix-network-graph-error-500Stan Hu2016-08-201-0/+12
* | | | Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissionsStan Hu2016-08-201-9/+10
* | | | Add spec for Ability.project_abilitiesStan Hu2016-08-201-0/+63
* | | | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+1
* | | | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-192-7/+9
|\ \ \ \
| * | | | 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-201-0/+8
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1910-1/+1366
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-191-4/+6
| * | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1710-24/+250
| |\ \ \ \ \
| * | | | | | 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-151-3/+6
* | | | | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-191-2/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into 'expiration-date-on-memberships'Sean McGivern2016-08-195-1/+1108
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1859-674/+1452
| |\ \ \ \ \ \
| * | | | | | | Replace optional parameters with keyword arguments.Adam Niedzielski2016-08-021-2/+12
* | | | | | | | Add a spec testing a second side effect of `Repository#merge`.21081-repository-merge-in-progress-merge-commit-sha-specTimothy Andrew2016-08-191-0/+8
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-175-0/+211
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'issue-boards' into 'master' Douwe Maan2016-08-174-0/+132
| |\ \ \ \ \ \
| | * | | | | | Add a movable scope and a movable? method to List modelDouglas Barbosa Alexandre2016-08-171-0/+20
| | * | | | | | Add a destroyable scope and a destroyable? method to List modelDouglas Barbosa Alexandre2016-08-171-0/+20
| | * | | | | | Remove useless delegate method on List modelDouglas Barbosa Alexandre2016-08-171-4/+0
| | * | | | | | Destroy related lists when a label is removedDouglas Barbosa Alexandre2016-08-171-0/+2
| | * | | | | | Ensure that we have only one list per label per boardDouglas Barbosa Alexandre2016-08-171-0/+6
| | * | | | | | Remove label_list factoryDouglas Barbosa Alexandre2016-08-171-1/+1
| | * | | | | | The lists: Backlog, and Done cannot be destroyedDouglas Barbosa Alexandre2016-08-172-1/+22