summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Pass commit data to ProcessCommitWorkerprocess-commit-worker-improvementsYorick Peterse2016-12-0112-25/+356
| | | | | | | | | | | By passing commit data to this worker we remove the need for querying the Git repository for every job. This in turn reduces the time spent processing each job. The migration included migrates jobs from the old format to the new format. For this to work properly it requires downtime as otherwise workers may start producing errors until they're using a newer version of the worker code.
* Merge branch 'rs-include-emailhelpers' into 'master' Rémy Coutable2016-12-0110-1/+16
|\ | | | | | | | | Only include EmailHelpers in mailer specs and specs using them See merge request !7836
| * Only include EmailHelpers in mailer specs and specs using themrs-include-emailhelpersRobert Speicher2016-12-0110-1/+16
| |
* | Merge branch 'remove-order-dependency-in-label-finder-spec' into 'master' Rémy Coutable2016-12-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove an order dependency in LabelsFinder specs Makes the LabelsFinder spec expectations order-independent There is an explicit ordering to `LabelsFinder` - title ascending - but two of the labels (a group label and a project label) have the same title, so the sort ordering isn't stable for those in all circumstances. It looks like this is intentional. See merge request !7788
| * | Rename a label to fix an intermittently-failing specNick Thomas2016-12-011-1/+1
| | |
* | | Merge branch 'clean-up-jira-service' into 'master' Sean McGivern2016-12-015-44/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up JiraService Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24967 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24777 See merge request !7756
| * | | Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-serviceAdam Niedzielski2016-12-015-44/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implicit interface of project services states that the "execute" method is meant to be called when project hooks are executed. Currently JiraService does not support any project events even though JiraService#supported_events says that "commit" and "merge_request" are supported. They are only used to render correct options in JIRA configuration screen, but they are not supported. Because of that, this commit makes "execute" method a no-op.
* | | | Merge branch 'improve_oauth_user_error' into 'master' Rémy Coutable2016-12-011-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the `Gitlab::OAuth::User` error message ## What does this MR do? Fixes a logging issue submitted by a customer at https://gitlab.zendesk.com/agent/tickets/50728. The error saving the user is logged to application.log. Previously, the entry had no context and was unusable - `Error saving user: [Email address already taken]`. Adding the auth hash UID and email makes the error more helpful. For such a small logging change, do we need a changelog entry? See merge request !7851
| * | | | Improve the `Gitlab::OAuth::User` error messageDrew Blessing2016-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error saving the user is logged to application.log. Previously, the entry had no context and was unusable - 'Error saving user: [Email address already taken]'. Adding the auth hash UID and email makes the error more helpful.
* | | | | Merge branch 'refactor-issuable-branch-chooser' into 'master' Robert Speicher2016-12-012-24/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor branch chooser in issuable form Continuation of #23864. Sister of gitlab-org/gitlab-ee!930. See merge request !7852
| * | | | Refactor branch chooser in issuable formrefactor-issuable-branch-chooserRémy Coutable2016-11-302-24/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '23718/backup-rake-task-human-readable' into 'master' Douwe Maan2016-12-014-8/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23718/backup rake task human readable ## What does this MR do? Add the human readable format to the backup tar file. From `1477317140_gitlab_backup.tar` to `1477317140_2016_10_24_gitlab_backup.tar`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? #23718 issue ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? 23718 See merge request !7188
| * | | | | Add Human Readable Timestamp to backup tar fileDavid Gerő2016-11-304-8/+47
| | | | | |
* | | | | | Merge branch ↵Robert Speicher2016-12-0116-192/+662
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install' into 'master' New `gitlab:workhorse:install` rake task ## Why was this MR needed? Because with this we can remove the "Ensure the gitlab-workhorse version in Install gitlab-workhorse matches the required version." step from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1! MR is ready: gitlab-org/release-tools!57 Closes #22719 See merge request !6574
| * | | | | | Move task helpers to a module22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-installRémy Coutable2016-11-3014-260/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Add #run_command! to task helpers to raise a TaskFailedError if status is not 0Rémy Coutable2016-11-306-26/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | New `gitlab:workhorse:install` rake taskRémy Coutable2016-11-309-47/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix/git-access-wiki-when-repository-feature-disabled' into ↵Sean McGivern2016-11-306-3/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixes access to the wiki code with git when repository feature disabled ## What does this MR do? Allow access to the wiki repository with git when the repository feature is disabled. ## Why was this MR needed? Without this fix, if you create a wiki only project you are not allowed to download the wiki code from this project. ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #24931 See merge request !7832
| * | | | | | | Add CHANGELOG entryfix/git-access-wiki-when-repository-feature-disabledDouglas Barbosa Alexandre2016-11-301-0/+4
| | | | | | | |
| * | | | | | | Improve Gitlab::GitAccessWiki spec with download access checksDouglas Barbosa Alexandre2016-11-301-0/+25
| | | | | | | |
| * | | | | | | Improve ProjectPolicy spec to check permissions when wiki is disabledDouglas Barbosa Alexandre2016-11-301-2/+12
| | | | | | | |
| * | | | | | | Allow access to the wiki with git when repository feature disabledDouglas Barbosa Alexandre2016-11-303-1/+16
| | | | | | | |
* | | | | | | | Merge branch '24710-fix-generic-commit-status-table-row' into 'master' Fatih Acet2016-11-303-39/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "External statuses not shown correctly on pipeline page" ## What does this MR do? Updates `generic_commit_status/_generic_commit_status.html.haml` template to match the changes made to `ci/builds/_build.html.haml` which had not previously been carried over. ## Testing 1. Ensure updated fixtures are installed (from !7792) so that these changes are made apparent. (check out the !7792 branch if not yet merged into master, then `bundle exec rake db:drop` and `bundle exec rake dev:setup`) 2. Visit a build list page or an individual pipeline page which contains an external build status. 3. The results should look like this: ### Before: ![Screen_Shot_2016-11-28_at_9.11.27_PM](/uploads/ed8c5beb857cd17147dbddf8f5ecab1d/Screen_Shot_2016-11-28_at_9.11.27_PM.png) ### After: ![Screen_Shot_2016-11-28_at_9.12.05_PM](/uploads/9f953a5f14764e336afa4481a917947f/Screen_Shot_2016-11-28_at_9.12.05_PM.png) ## Are there points in the code the reviewer needs to double check? Look for any places where these partials may be rendered to ensure external status match regular build statuses. ## Why was this MR needed? The generic commit status template has been largely overlooked when changes are made to build table rows which should be duplicated in both places. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24710 See merge request !7811
| * | | | | | | | add CHANGELOG.md entry for !781124710-fix-generic-commit-status-table-rowMike Greiling2016-11-291-0/+4
| | | | | | | | |
| * | | | | | | | collapse nested if statementMike Greiling2016-11-292-6/+4
| | | | | | | | |
| * | | | | | | | remove redundant if statementMike Greiling2016-11-292-4/+0
| | | | | | | | |
| * | | | | | | | reformat build duration and finish time to match /ci/builds/_build.html.hamlMike Greiling2016-11-291-8/+12
| | | | | | | | |
| * | | | | | | | reorder generic commit status columns to match build status partialMike Greiling2016-11-291-22/+29
| | | | | | | | |
| * | | | | | | | fetch local parameters in _generic_commit_status.html.haml similar to how ↵Mike Greiling2016-11-291-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _build.html.haml handles them
* | | | | | | | | Merge branch 'autocomplete-stays-open' into 'master' Fatih Acet2016-11-301-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed GFM autocomplete regex ## What does this MR do? Their was a bug in the regex that meant it was matching from the beginning of the GFM input text. This fixes that by splitting spaces & then checking on the last match. It also fixes a bug where `@#` etc. would open 2 autocomplete dropdowns. ## What are the relevant issue numbers? Closes #25119 See merge request !7826
| * | | | | | | | Fixed GFM autocomplete regexautocomplete-stays-openPhil Hughes2016-11-301-1/+2
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix it is possible that the autocomplete popup will stay open with the very first match, no matter if there is a match further in the string. Closes #25119
* | | | | | | | Merge branch 'docs/git-submodules-with-ci' into 'master' Achilleas Pipinellis2016-11-304-110/+96
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the Git submodules with CI docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22567 See merge request !7856
| * | | | | | | | Refactor the Git submodules with CI docsAchilleas Pipinellis2016-11-304-110/+96
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch '25092-change-font-commit-list-in-system-note' into 'master' Fatih Acet2016-11-301-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Change font of commit list in a system note according to proposed design" ## What does this MR do? This MR closes #25092 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? To improve `UX` ## Screenshots (if relevant) **Before** ![before](/uploads/50b72a1f818c5a5dc633b06eee3eff92/before.png) **After** ![after](/uploads/7a488fe22a942af8846fcd202da8f400/after.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25092 See merge request !7822
| * | | | | | | | adjust commit list ul height25092-change-font-commit-list-in-system-noteNur Rony2016-11-301-1/+1
| | | | | | | | |
| * | | | | | | | adjust padding in listNur Rony2016-11-301-1/+1
| | | | | | | | |
| * | | | | | | | makes ul bullets fully visibleNur Rony2016-11-301-1/+1
| | | | | | | | |
| * | | | | | | | shows commits SHAs in monospcase and commit messaages in normal fontNur Rony2016-11-301-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'issue_24363' into 'master' Fatih Acet2016-11-3012-42/+129
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix appearance in error pages ## What does this MR do? The error pages under `app/views/errors/*` looks like the error page for 404 `public/404.html` ## Are there points in the code the reviewer needs to double check? I restructured how the GitLab logo is shown in the `public/404.html` and all the pages under `app/views/errors/*`. ## Why was this MR needed? #24363 ## Screenshots (if relevant) Before ![Screen_Shot_2016-11-10_at_11.11.48](/uploads/b134195dd2d63d093ec0a6d906761e3f/Screen_Shot_2016-11-10_at_11.11.48.png) After ![Selection_064](/uploads/d57601513d6ab3c0b5e1c7448ecf6ffc/Selection_064.png)![Selection_057](/uploads/50220320bad0b1c14ec8d1e89e490373/Selection_057.png)![Selection_060](/uploads/1e04e4ce36ef7fa5bee4e7916b0e5de2/Selection_060.png)![Selection_059](/uploads/0a4a02a8bae132232d4331adce132d4a/Selection_059.png)![Selection_062](/uploads/3d96f0e8c0e5f0f73b3b51cbb168c76a/Selection_062.png)![Selection_061](/uploads/e127a2b2acc810a9176d02927f1c8dbc/Selection_061.png)![Selection_063](/uploads/e3f682c293539ff195a78018da872abf/Selection_063.png) ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7635
| * | | | | | | | Fix appearance in error pagesLuis Alonso Chavez Armendariz2016-11-2912-42/+129
| | | | | | | | |
* | | | | | | | | Merge branch '25044-md-header-tabs' into 'master' Annabel Dunstone Gray2016-11-301-7/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25044 Make md header tabs match nav tabs ## What does this MR do? Changes styling of md-header tabs to match navigation tabs ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25044 See merge request !7801
| * | | | | | | | | 25044 Make md header tabs match nav tabs25044-md-header-tabstauriedavis2016-11-291-7/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch '24894-style-system-note-in-commit-discussion' into 'master' Annabel Dunstone Gray2016-11-302-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new system note design for commit discussion ## What does this MR do? This MR implement new system notes design for discussion on a commit. ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? It improves UX and coherent style in UI ## Screenshots (if relevant) **before** ![commit-discussion-before](/uploads/b68ab7cce583a18ac066691448f955e7/commit-discussion-before.png) **After** ![commit-discussion-after](/uploads/e9c0cb48c29fdd9b6de6f23a3c588d03/commit-discussion-after.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24894 See merge request !7721
| * | | | | | | | | | removes redundant styles24894-style-system-note-in-commit-discussionNur Rony2016-11-301-116/+0
| | | | | | | | | | |
| * | | | | | | | | | changelog entry addedNur Rony2016-11-301-0/+4
| | | | | | | | | | |
| * | | | | | | | | | new system note design for commit discussionNur Rony2016-11-301-0/+120
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '24844-environments-date' into 'master' Fatih Acet2016-11-303-4/+34
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Environments displaying incorrect date since 8.14 upgrade" ## What does this MR do? Shows the correct date in the environments table. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Date shown was not the correct one. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24844 See merge request !7830
| * | | | | | | | | Fix comma-dangle in function's arguments errors24844-environments-dateFilipa Lacerda2016-11-302-3/+3
| | | | | | | | | |
| * | | | | | | | | Improvements after reviewFilipa Lacerda2016-11-301-4/+10
| | | | | | | | | |
| * | | | | | | | | Use created date from last_deploymentFilipa Lacerda2016-11-303-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds test Adds changelog entry