summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-1815-20/+47
|\
| * Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-1815-20/+47
* | Merge branch 'master' into 'master' Jacob Schatz2016-07-181-1/+1
|\ \
| * | Fix activity heatmap to show proper day name.eanplatter2016-07-161-1/+1
* | | Merge branch '19928-nomethoderror-undefined-method-id-for-nil-nilclass' into ...Rémy Coutable2016-07-181-1/+1
|\ \ \
| * | | Don't blow up in tree view on empty repoSean McGivern2016-07-181-1/+1
* | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-182-26/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-1845-159/+143
| |\ \ \
| * | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-162-26/+12
* | | | | Merge branch 'pending-tab' into 'master' Rémy Coutable2016-07-184-7/+21
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unused .js-running-count classKatarzyna Kobierska2016-07-182-6/+6
| * | | | Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-184-4/+18
* | | | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-185-3/+13
|\ \ \ \ \
| * | | | | Track a user who created a pipelineKamil Trzcinski2016-07-155-3/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable2016-07-181-0/+1
|\ \ \ \ \
| * | | | | Fix creation of deployment on build that is retried, redeployed or rollbackfix-deployment-creation-on-build-retryKamil Trzcinski2016-07-161-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable2016-07-181-1/+2
|\ \ \ \ \
| * | | | | Allow to access Container Registry for Public and Internal projectsallow-to-pull-public-imagesKamil Trzcinski2016-07-151-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-stage-status-show-for-pipelines' into 'master' Rémy Coutable2016-07-181-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix stage status shown for pipelinesfix-stage-status-show-for-pipelinesKamil Trzcinski2016-07-151-1/+1
| |/ / /
* | | | Merge branch 'fix/import-export-retry-settings' into 'master' Rémy Coutable2016-07-181-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | limit project expor retry to only 3James Lopez2016-07-181-1/+1
* | | | Merge branch 'allow-blank-import-url' into 'master' Rémy Coutable2016-07-181-2/+2
|\ \ \ \
| * | | | use method in validates statementJames Lopez2016-07-181-1/+1
| * | | | Allow a project import URL to be blank to prevent false positivesStan Hu2016-07-171-2/+2
| |/ / /
* | | | Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable2016-07-183-5/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix not normalized emoji pathsdixpac2016-07-143-5/+8
* | | | Align cancel and retry buttons19907-deployAnnabel Dunstone2016-07-162-1/+3
* | | | Remove deploy to production buttonAnnabel Dunstone2016-07-161-10/+1
| |_|/ |/| |
* | | Merge branch 'legacy-diff-notes-are-dumb' into 'master' Douwe Maan2016-07-152-3/+3
|\ \ \
| * | | Don't fail when a LegacyDiffNote didn't store the right diffDouwe Maan2016-07-152-3/+3
* | | | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-1511-61/+53
* | | | Don't fail when Ci::Pipeline doesn't have a projectDouwe Maan2016-07-151-0/+2
|/ / /
* | | Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-6/+3
|\ \ \
| * | | use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-141-1/+1
| * | | kill the nowrap optionhttp://jneen.net/2016-07-141-2/+3
| * | | rm dead `highlighter` methodhttp://jneen.net/2016-07-141-4/+0
* | | | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-1510-31/+36
|\ \ \ \
| * | | | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-144-10/+13
| * | | | Use a single challenge for U2F authentication.Timothy Andrew2016-07-142-7/+15
| * | | | Load Javascript U2F library selectively.Timothy Andrew2016-07-148-22/+16
* | | | | Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-me...Douwe Maan2016-07-151-2/+1
|\ \ \ \ \
| * | | | | When Issue author assign or mention himself Todos are createdKatarzyna Kobierska2016-07-141-2/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-151-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...James Lopez2016-07-1517-65/+52
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | add project name and namespace to filename on project exportJames Lopez2016-07-151-1/+1
* | | | | | Merge branch 'fix-mentioned-users-on-diff-notes' into 'master' Douwe Maan2016-07-152-6/+9
|\ \ \ \ \ \
| * | | | | | Use cattr_accessor instead duplicating code on NoteOnDiff concernDouglas Barbosa Alexandre2016-07-153-9/+9
| * | | | | | Fix mentioned users list on diff notesDouglas Barbosa Alexandre2016-07-151-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-creating-group-with-space-in-group-path'Douwe Maan2016-07-151-1/+1
|\ \ \ \ \ \
View Lorry Controller Status