summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-30111-580/+698
|\
| * Merge branch 'fix/create-pipeline-with-builds-in-transaction' into 'master' Kamil Trzciński2016-11-302-11/+23
| |\
| | * Restore method that ensures builds being createdGrzegorz Bizon2016-11-251-0/+15
| | * 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-307-19/+20
| |\ \
| | * | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-297-19/+20
| * | | Merge branch 'fix/ca-no-date' into 'master' Douwe Maan2016-11-303-5/+12
| |\ \ \
| | * \ \ 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
| | |/ / /
| | * | | use an empty total time when the build has not started yet so the UI knowsJames Lopez2016-11-252-2/+6
| | * | | fix for builds with no start date and specJames Lopez2016-11-251-0/+2
| * | | | Merge branch 'improve/invite-accept-page' into 'master' Douwe Maan2016-11-301-3/+10
| |\ \ \ \
| | * | | | 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-303-14/+10
| |\ \ \ \ \
| | * | | | | CE-specific changes gitlab-org/gitlab-ee#1137ee-1137-follow-up-protected-branch-users-and-groupsTimothy Andrew2016-11-293-14/+10
| * | | | | | Merge branch '24999-fix-project-avatar-alignment' into 'master' Annabel Dunstone Gray2016-11-301-0/+1
| |\ \ \ \ \ \
| | * | | | | | Fix the width of project avatars in order to adjust alignment within their co...Ryan Harris2016-11-261-0/+1
| * | | | | | | Merge branch '25002-sentence-case-dashboard-tabs' into 'master' Annabel Dunstone Gray2016-11-301-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Changes project dashboard tabs to sentence casingRyan Harris2016-11-261-3/+3
| | |/ / / / / /
| * | | | | | | 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-291-5/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Adds hoverstates for collapsed Issue/Merge Request sidebar25011-hoverstates-for-collapsed-issue-merge-request-sidebarDimitrie Hoekstra2016-11-291-5/+11
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | 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-291-11/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Moved groups above projects24135-new-project-should-be-below-new-group-on-the-welcome-screenLuke "Jared" Bennett2016-11-291-11/+12
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'remove-jsx-react-eslint-plugins' into 'master' Fatih Acet2016-11-292-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Remove JSX/React eslint plugins.remove-jsx-react-eslint-pluginsLuke "Jared" Bennett2016-11-292-2/+2
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'feature/expose-timestimes-in-build-entity' into 'master' Grzegorz Bizon2016-11-291-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Expose timestamp in build entity used by serializerfeature/expose-timestimes-in-build-entityGrzegorz Bizon2016-11-291-0/+3
| | |/ / / / / /
| * | | | | | | Merge branch '25055-pipelines-info-missing-from-mr-widget' into 'master' Annabel Dunstone Gray2016-11-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix pipelines info being hidden in merge request widget25055-pipelines-info-missing-from-mr-widgetAdam Niedzielski2016-11-291-1/+1
| * | | | | | | Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-292-1/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-282-1/+11
| * | | | | | | | Merge branch '24150-consistent-dropdown-styles' into 'master' Annabel Dunstone Gray2016-11-2914-57/+84
| |\ \ \ \ \ \ \ \
| | * | | | | | | | dropdowns.scss: Fix style issues after reviewDavid Wagner2016-11-281-5/+0
| | * | | | | | | | Update some more sort/filter dropdownsDavid Wagner2016-11-288-17/+17
| | * | | | | | | | Make open and hovered dropdown toggles look the sameDavid Wagner2016-11-281-8/+11
| | * | | | | | | | Homogenize dropdowns on Issue pageDavid Wagner2016-11-286-40/+69
| * | | | | | | | | Merge branch 'hide-project-variables' into 'master' Fatih Acet2016-11-295-2/+57
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable ESLint and fix minor code style stuff in project_variables.js.es6.hide-project-variablesFatih Acet2016-11-291-21/+20
| | * | | | | | | | | Add spec for hiding variables and remove the need for ES6 SymbolStan Hu2016-11-241-3/+3
| | * | | | | | | | | Hide project variables values by defaultStan Hu2016-11-245-2/+58
| * | | | | | | | | | Merge branch 'refactor-issuable-description-and-metadata' into 'master' Robert Speicher2016-11-293-45/+56
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Refactor issuable description and metadata form sectionsrefactor-issuable-description-and-metadataRémy Coutable2016-11-253-45/+56
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' i...Douwe Maan2016-11-2913-32/+55
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Use assigned variables betterhoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emailsSean McGivern2016-11-282-5/+3
| | * | | | | | | | | | Don't use diff_line_content for emailsSean McGivern2016-11-282-4/+2
| | * | | | | | | | | | Don't remove + / - signs from diff emailsSean McGivern2016-11-282-2/+4
| | * | | | | | | | | | Tidy up text emailsSean McGivern2016-11-285-10/+9
View Lorry Controller Status