summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Speed up Group security access specsrs-group-security-spec-speedRobert Speicher2016-11-304-219/+181
* 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
|\ \ \ \ \ \ \
| * | | | | | | Adds hoverstates for collapsed Issue/Merge Request sidebar25011-hoverstates-for-collapsed-issue-merge-request-sidebarDimitrie Hoekstra2016-11-292-5/+15
* | | | | | | | Merge branch '24135-new-project-should-be-below-new-group-on-the-welcome-scre...24834-timeago-not-working-properly-on-dynamically-loading-diff-discussionsAlfredo Sumaran2016-11-292-11/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Moved groups above projects24135-new-project-should-be-below-new-group-on-the-welcome-screenLuke "Jared" Bennett2016-11-292-11/+16
* | | | | | | | | Merge branch 'remove-jsx-react-eslint-plugins' into 'master' Fatih Acet2016-11-2912-36/+39
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Remove JSX/React eslint plugins.remove-jsx-react-eslint-pluginsLuke "Jared" Bennett2016-11-2912-36/+39
* | | | | | | | | Merge branch 'feature/expose-timestimes-in-build-entity' into 'master' Grzegorz Bizon2016-11-292-9/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Expose timestamp in build entity used by serializerfeature/expose-timestimes-in-build-entityGrzegorz Bizon2016-11-292-9/+19
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '25055-pipelines-info-missing-from-mr-widget' into 'master' Annabel Dunstone Gray2016-11-292-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix pipelines info being hidden in merge request widget25055-pipelines-info-missing-from-mr-widgetAdam Niedzielski2016-11-292-1/+5
* | | | | | | | | Merge branch 'removing_unnecessary_indexes' into 'master' Yorick Peterse2016-11-293-9/+37
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove unnecessary database indexesValery Sizov2016-11-293-9/+37
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'readme-link-fix' into 'master' Rémy Coutable2016-11-292-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix broken README.md UX guide link.Dan Dedrick2016-11-282-1/+5
* | | | | | | | Merge branch 'fix/blob-controller-spec' into 'master' Sean McGivern2016-11-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix blob controller spec failure - updated not to use file-path-fix/blob-controller-specJames Lopez2016-11-292-2/+2
| * | | | | | | | fix blob controller spec failureJames Lopez2016-11-291-1/+1
* | | | | | | | | Merge branch 'docs/fix-bitbucket-integration-typos' into 'master' Achilleas Pipinellis2016-11-291-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixing typo & Clarifying Key nameLee Matos2016-11-291-2/+2
* | | | | | | | | | Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-298-2/+94
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-288-2/+94
* | | | | | | | | | | Merge branch 'zj-issue-search-slash-command' into 'master' Kamil Trzciński2016-11-297-9/+71
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add issue search slash commandzj-issue-search-slash-commandZ.J. van de Weg2016-11-257-9/+71
* | | | | | | | | | | | Merge branch '24150-consistent-dropdown-styles' into 'master' Annabel Dunstone Gray2016-11-2916-60/+91
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | dropdowns.scss: Fix style issues after reviewDavid Wagner2016-11-281-5/+0
| * | | | | | | | | | | Update some more sort/filter dropdownsDavid Wagner2016-11-288-17/+17
| * | | | | | | | | | | Update the ChangelogDavid Wagner2016-11-281-0/+4
| * | | | | | | | | | | Make open and hovered dropdown toggles look the sameDavid Wagner2016-11-281-8/+11
| * | | | | | | | | | | Homogenize dropdowns on Issue pageDavid Wagner2016-11-287-43/+72
* | | | | | | | | | | | Merge branch 'hide-project-variables' into 'master' Fatih Acet2016-11-296-2/+82
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Enable ESLint and fix minor code style stuff in project_variables.js.es6.hide-project-variablesFatih Acet2016-11-291-21/+20