summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'move-timeago-to-vendor-dir' into 'master' Alfredo Sumaran2016-11-232-2/+1
|\
| * timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dirMike Greiling2016-11-222-2/+1
* | Merge branch 'api-delete-group-share' into 'master' Rémy Coutable2016-11-231-0/+30
|\ \
| * | API: Add endpoint to delete a group shareapi-delete-group-shareRobert Schilling2016-11-231-0/+30
* | | Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' Sean McGivern2016-11-231-0/+54
|\ \ \
| * | | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-231-0/+54
* | | | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-236-19/+74
|\ \ \ \
| * | | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-236-19/+74
* | | | | Merge branch 'post_receive-any-email' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ \ \ \
| * | | | | update existing testElan Ruusamäe2016-11-061-1/+1
* | | | | | Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-userAhmad Sherif2016-11-231-1/+1
* | | | | | Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif2016-11-232-6/+8
* | | | | | Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif2016-11-234-54/+54
| |/ / / / |/| | | |
* | | | | Merge branch 'remove-empty-describe-block' into 'master' Rémy Coutable2016-11-231-3/+0
|\ \ \ \ \
| * | | | | Remove empty describe block in service specSemyon Pupkov2016-11-221-3/+0
* | | | | | Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan2016-11-231-0/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issueJames Lopez2016-11-231-0/+8
* | | | | | Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' Robert Speicher2016-11-231-0/+23
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix sidekiq stats in admin areablackst0ne2016-11-231-0/+23
* | | | | | Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran2016-11-233-2/+10
|\ \ \ \ \ \
| * | | | | | clean up globals exemptions within .eslintrcMike Greiling2016-11-223-2/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'disable-calendar-deselection' into 'master' Fatih Acet2016-11-221-0/+41
|\ \ \ \ \ \
| * | | | | | Fix deselecting calendar days on contribution graphClement Ho2016-11-041-0/+41
* | | | | | | Merge branch 'emoji-btn-disabled' into 'master' Fatih Acet2016-11-221-41/+52
|\ \ \ \ \ \ \
| * | | | | | | Disabled award emoji button when user is not logged inemoji-btn-disabledPhil Hughes2016-11-221-41/+52
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix/build-without-trace-exceptions' into 'master' Kamil Trzciński2016-11-222-79/+118
|\ \ \ \ \ \ \
| * | | | | | | Improve name of build log state data attributefix/build-without-trace-exceptionsGrzegorz Bizon2016-11-221-1/+1
| * | | | | | | Improve reproducibility of build trace test exampleGrzegorz Bizon2016-11-221-2/+4
| * | | | | | | Add missing feature tests for loading build traceGrzegorz Bizon2016-11-221-4/+16
| * | | | | | | Add missing specs for loading build HTML traceGrzegorz Bizon2016-11-221-7/+23
| * | | | | | | Refactor feature tests for project builds pageGrzegorz Bizon2016-11-221-75/+84
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/cycle-analytics-duration' into 'master' James Lopez2016-11-221-1/+9
|\ \ \ \ \ \ \
| * | | | | | | fix rubocop warningfix/cycle-analytics-durationJames Lopez2016-11-221-1/+1
| * | | | | | | fixed bug to do with calculating durationsJames Lopez2016-11-221-1/+9
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master' Kamil Trzciński2016-11-221-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Issue creation now accepts trailing whitespacezj-fix-trailing-whitespace-issue-createZ.J. van de Weg2016-11-221-0/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs-project-team-helpers' into 'master' Sean McGivern2016-11-224-62/+69
|\ \ \ \ \ \ \
| * | | | | | | Add shortcuts for adding users to a project team with a specific rolers-project-team-helpersRobert Speicher2016-11-184-62/+69
* | | | | | | | Merge branch '24576_cant_stop_impersonating' into 'master' Sean McGivern2016-11-221-7/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Allow admins to stop impersonating users without e-mail addressesOren Kanner2016-11-171-7/+21
* | | | | | | | Merge branch 'fix-api-iid-filter' into 'master' Rémy Coutable2016-11-222-0/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix IID filter for merge requests and milestonesRobert Schilling2016-11-222-0/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet2016-11-222-0/+48
|\ \ \ \ \ \ \
| * | | | | | | Improve the mattermost help boxZ.J. van de Weg2016-11-212-0/+48
* | | | | | | | Merge branch 'fix-failed-email-for-external-jobs' into 'master' Kamil Trzciński2016-11-221-0/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Just create failed builds rather than calling eventsLin Jen-Shin2016-11-221-6/+3
| * | | | | | | External jobs do not have show page nor tracesLin Jen-Shin2016-11-211-1/+7
* | | | | | | | Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński2016-11-221-18/+33
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix entry lookup in CI config inheritance rulesGrzegorz Bizon2016-11-221-1/+3
| * | | | | | | Extend specs for global ci configuration entryGrzegorz Bizon2016-11-221-18/+31
| |/ / / / / /