summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert bump in rufus-schedulerrevert-rufus-scheduler-bumpStan Hu2016-11-301-2/+1
* Merge branch 'grapify-projects-api' into 'master' Rémy Coutable2016-11-304-358/+288
|\
| * Grapify the projects APIgrapify-projects-apiRobert Schilling2016-11-284-358/+288
* | Merge branch '25031-do-not-raise-error-in-autocomplete' into 'master' Rémy Coutable2016-11-303-1/+14
|\ \
| * | Do not raise error in AutocompleteController#users when not authorizedSemyon Pupkov2016-11-303-1/+14
* | | Merge branch 'rs-group-security-spec-speed' into 'master' Rémy Coutable2016-11-304-219/+181
|\ \ \
| * | | Speed up Group security access specsrs-group-security-spec-speedRobert Speicher2016-11-304-219/+181
* | | | Merge branch 'fix/create-pipeline-with-builds-in-transaction' into 'master' Kamil Trzciński2016-11-305-95/+108
|\ \ \ \
| * | | | Extend pipelines factory with transient config attributefix/create-pipeline-with-builds-in-transactionGrzegorz Bizon2016-11-272-14/+9
| * | | | Improve readability in pipeline test objects factoryGrzegorz Bizon2016-11-251-6/+10
| * | | | Remove pipeline factory that is not used in testsGrzegorz Bizon2016-11-251-6/+0
| * | | | Restore method that ensures builds being createdGrzegorz Bizon2016-11-253-21/+52
| * | | | Add Changelog entry for pipeline creation improvementsGrzegorz Bizon2016-11-251-0/+4
| * | | | Remove remaining calls to CI yaml in pipeline specsGrzegorz Bizon2016-11-251-5/+0
| * | | | Move helpers to the end of process pipeline specsGrzegorz Bizon2016-11-251-29/+29
| * | | | Update pipeline processing specs for creating buildsGrzegorz Bizon2016-11-251-35/+28
| * | | | Create pipeline along with builds in the transationGrzegorz Bizon2016-11-242-12/+9
* | | | | Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-3012-39/+56
|\ \ \ \ \
| * | | | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-2912-39/+56
* | | | | | Merge branch 'patch-1' into 'master' Sean McGivern2016-11-301-1/+1
|\ \ \ \ \ \
| * | | | | | Rewrite an HTTP link to use HTTPSAlex Jordan2016-11-291-1/+1
* | | | | | | Merge branch 'fix/ca-no-date' into 'master' Douwe Maan2016-11-305-6/+68
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/fix/ca-no-date' into fix/ca-no-datefix/ca-no-dateJames Lopez2016-11-291-4/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Show dashes when date is emptyAlfredo Sumaran2016-11-281-4/+9
| * | | | | | | | fix started_at checkJames Lopez2016-11-291-5/+1
| |/ / / / / / /
| * | | | | | | fix rubocop warningJames Lopez2016-11-251-1/+1
| * | | | | | | use an empty total time when the build has not started yet so the UI knowsJames Lopez2016-11-253-3/+29
| * | | | | | | Add changelog entryJames Lopez2016-11-251-0/+4
| * | | | | | | fix for builds with no start date and specJames Lopez2016-11-252-1/+32
* | | | | | | | Merge branch '24772-fix-transient-failing-spec' into 'master' Sean McGivern2016-11-301-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix a transient spec failure24772-fix-transient-failing-specRémy Coutable2016-11-291-1/+1
* | | | | | | | Merge branch 'add-stackprof' into 'master' Robert Speicher2016-11-304-0/+130
|\ \ \ \ \ \ \ \
| * | | | | | | | Add StackProf to the Gemfile, along with a utility to get a profile for a specNick Thomas2016-11-294-0/+130
* | | | | | | | | Merge branch 'sh-update-sidekiq-cron' into 'master' Robert Speicher2016-11-303-5/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1sh-update-sidekiq-cronStan Hu2016-11-293-5/+10
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '23666-set-null-true-for-timestamps-columns-in-migrations' into ...Robert Speicher2016-11-3023-24/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Add `null: true` to timestamps in migrations that does not define it23666-set-null-true-for-timestamps-columns-in-migrationsRémy Coutable2016-11-2823-24/+24
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'improve/invite-accept-page' into 'master' Douwe Maan2016-11-302-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a CHANGELOG entryimprove/invite-accept-pageDouglas Barbosa Alexandre2016-11-291-0/+4
| * | | | | | | | Alert user when logged in user email is not the same as the invitationDouglas Barbosa Alexandre2016-11-291-3/+10
* | | | | | | | | Merge branch 'ee-1137-follow-up-protected-branch-users-and-groups' into 'mast...Douwe Maan2016-11-304-16/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CE-specific changes gitlab-org/gitlab-ee#1137ee-1137-follow-up-protected-branch-users-and-groupsTimothy Andrew2016-11-294-16/+12
* | | | | | | | | | Merge branch '24999-fix-project-avatar-alignment' into 'master' Annabel Dunstone Gray2016-11-302-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the width of project avatars in order to adjust alignment within their co...Ryan Harris2016-11-262-0/+5
* | | | | | | | | | | Merge branch '25002-sentence-case-dashboard-tabs' into 'master' Annabel Dunstone Gray2016-11-303-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90acRyan Harris2016-11-291-1/+1
| * | | | | | | | | | Changes project dashboard tabs to sentence casingRyan Harris2016-11-262-3/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'add-sub-nav-active-color' into 'master' Annabel Dunstone Gray2016-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add blue back to sub nav activetauriedavis2016-11-291-1/+1
* | | | | | | | | | | Merge branch '25011-hoverstates-for-collapsed-issue-merge-request-sidebar' in...Fatih Acet2016-11-292-5/+15
|\ \ \ \ \ \ \ \ \ \ \