summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Add most of specs for chat namesKamil Trzcinski2016-11-1712-22/+182
| | | | | | | | | | |
| * | | | | | | | | | Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-1712-1/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them [ci skip]
* | | | | | | | | | | Merge branch 'fix-tests-for-different-host' into 'master' Rémy Coutable2016-11-1811-16/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `Gitlab.config.gitlab.host` over `'localhost'` Use `Gitlab.config.gitlab.host` over `'localhost'` This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all. See merge request !7562
| * | | | | | | | | | | Use `Gitlab.config.gitlab.host` over `'localhost'`fix-tests-for-different-hostLin Jen-Shin2016-11-1811-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all.
* | | | | | | | | | | | Merge branch 'autocomplete-find-user-improv' into 'master' Rémy Coutable2016-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved Ruby code in autocomplete user search ## What does this MR do? Improves the Ruby code for finding users in the assignee dropdown based on the Ruby review. See merge request !7576
| * | | | | | | | | | | Improved Ruby code in autocomplete user searchPhil Hughes2016-11-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-empty-todo-messages' into 'master' Alfredo Sumaran2016-11-181-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve consistency of empty todo list messages - They all now end with punctuation - Not everyone enjoys, or can even drink, coffee - The "High five!" message had no context for why we were high-fiving - "Henceforth" is one word [ci skip] See merge request !7572
| * | | | | | | | | | | | Improve consistency of empty todo list messagesRobert Speicher2016-11-181-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - They all now end with punctuation - Not everyone enjoys, or can even drink, coffee - The "High five!" message had no context for why we were high-fiving - "Henceforth" is one word [ci skip]
* | | | | | | | | | | | | Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan2016-11-187-6/+199
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add parsing support for incoming html email ## What does this MR do? Fixes #18388 by adding support for parsing HTML email ## Are there points in the code the reviewer needs to double check? The new class, Gitlab::Email::HTMLParser, which needs to translate the HTML content to text and also delete replies, as they are not necessarily in the correct format to be caught by EmailReplyParser. The solution I found that should work for any HTML-formatted email is to remove all `<table>` and `<blockquote>` tags. Actual `<table>` elements (to be interpreted by markdown) should already be encoded with e.g. `&lt;table&gt;` - the only failure mode is if there is an *actual* HTML table in the content itself, which we wouldn't be able to support easily anyways. The gem `html2text` traverses the HTML tree and outputs text - and markdown in the case of HTML links or images. See merge request !7397
| * | | | | | | | | | | | | add a CHANGELOG entrybugfix/html-only-mailhttp://jneen.net/2016-11-181-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix indentation for rubocophttp://jneen.net/2016-11-171-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | rename `part` variable and guard against nil content_typehttp://jneen.net/2016-11-171-7/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | completely remove blockquote and table tagshttp://jneen.net/2016-11-171-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | use Nokogiri::HTML.parse instead of capitalized methodhttp://jneen.net/2016-11-171-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix rubocop failureshttp://jneen.net/2016-11-172-2/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | add parsing support for incoming html emailhttp://jneen.net/2016-11-176-5/+194
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Rémy Coutable2016-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-fail' into 'master' Resolve "spec/lib/gitlab/backend/shell_spec.rb causes other specs to fail" ## What does this MR do? It ensures we rely on `Gitlab::Shell`'s public API and not on its internal. Since `Gitlab::Shell` is caching the value of its token, the only way to get the correct token is to call `Gitlab::Shell.secret_token`, not to read the `Gitlab.config.gitlab_shell.secret_file` file! Fixes #24599 See merge request !7557
| * | | | | | | | | | | | | Rely on Gitlab::Shell public API, not reading internal files it may use24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-failRémy Coutable2016-11-181-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It ensures we rely on `Gitlab::Shell`'s public API and not on its internal. Since `Gitlab::Shell` is caching the value of its token, the only way to get the correct token is to call `Gitlab::Shell.secret_token`, not to read the `Gitlab.config.gitlab_shell.secret_file` file! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'docs/no-artifacts-passing' into 'master' Achilleas Pipinellis2016-11-181-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to prevent artifacts from passing to next stage See merge request !7575
| * | | | | | | | | | | | Document how to prevent artifacts from passing to next stageAchilleas Pipinellis2016-11-181-0/+9
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch '24617-skipped-icon-title' into 'master' Fatih Acet2016-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove title from skipped status svg Closes #24617 See merge request !7570
| * | | | | | | | | | | | Remove title from skipped status svg24617-skipped-icon-titleAnnabel Dunstone Gray2016-11-181-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jasperdenkers/gitlab-ce-ci-play-heroku-example' into 'master' Achilleas Pipinellis2016-11-181-6/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI example for Play/Scala apps with deployment to Heroku Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3204 See merge request !7574
| * | | | | | | | | | | | Merge the two Scala examplesAchilleas Pipinellis2016-11-183-51/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | Add Play/Scala CI example with deployment to HerokuJasper Denkers2016-11-182-0/+45
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '23205-information-about-environments-build-page' into 'master' Fatih Acet2016-11-189-12/+362
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment info to builds page ![Screen_Shot_2016-11-02_at_5.44.01_PM](/uploads/3443d9518997147d1e6f41830e3774ff/Screen_Shot_2016-11-02_at_5.44.01_PM.png) Closes #23205 See merge request !7251
| * | | | | | | | | | | | Fix builds/show spec; use iid instead of id23205-information-about-environments-build-pageAnnabel Dunstone Gray2016-11-173-6/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix tests and add has_environment?Kamil Trzcinski2016-11-175-11/+45
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve specs and add missing cases that were not supportedKamil Trzcinski2016-11-177-22/+153
| | | | | | | | | | | | |
| * | | | | | | | | | | | Finish specs for environment infoAnnabel Dunstone Gray2016-11-092-17/+64
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refine specs for build show page with environmentsGrzegorz Bizon2016-11-092-23/+39
| | | | | | | | | | | | |
| * | | | | | | | | | | | First pass at testsAnnabel Dunstone Gray2016-11-092-7/+58
| | | | | | | | | | | | |
| * | | | | | | | | | | | Expose `last_deployment` on `Ci::Builds` [ci skip]Kamil Trzcinski2016-11-084-22/+47
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add switch statement & last_deployment methodAnnabel Dunstone Gray2016-11-083-3/+31
| | | | | | | | | | | | |
| * | | | | | | | | | | | Start adding environment infoAnnabel Dunstone Gray2016-11-082-0/+14
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pass-correct-tag-target-to-post-receive' into 'master' Sean McGivern2016-11-183-3/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass correct tag target to post-receive hook when creating tag via UI Fixes #24437 See merge request !7556
| * | | | | | | | | | | | Pass correct tag target to post-receive hook when creating tag via UIpass-correct-tag-target-to-post-receiveAdam Niedzielski2016-11-183-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to handle annotated tags that are created via GitLab UI. Annotated tags have their own SHA. We have to pass this SHA to post-receive hook to mirror what happens when someone creates an annotated tag in their local repository and pushes it via command line. In order to obtain tag SHA we first have to create it. This is a bit confusing because we create the tag before executing pre-hooks, but there is no way to create a tag outside the repository. If pre-hooks fail we have to clean up after ourselves.
* | | | | | | | | | | | | Merge branch 'fix/pipeline-id-metrics-migration' into 'master' Douwe Maan2016-11-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration missing ignored transaction method Adds missing `disable_ddl_transaction!` to migration See merge request !7569
| * | | | | | | | | | | | | fix migration missing ignored transaction methodJames Lopez2016-11-181-0/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'issue_13232' into 'master' Sean McGivern2016-11-187-39/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JIRA remotelinks and prevent duplicated closing messages implements #13232 closes #20479 See merge request !7413
| * | | | | | | | | | | | | | Add JIRA remotelinks and prevent duplicated closing messagesFelipe Artur2016-11-187-39/+189
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix-admin-ci-table' into 'master' Annabel Dunstone Gray2016-11-183-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix misaligned buttons on admin builds page ## What does this MR do? Fix misaligned buttons on admin builds page ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Because buttons are misaligned. ## Screenshots (if relevant) ![fix-admin-ci-table](/uploads/49472f7a12f868556e1bf482c9f837c4/fix-admin-ci-table.gif) ## 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 - [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? Fixes #24371 See merge request !7424
| * | | | | | | | | | | | | | Fix misaligned buttons on admin builds pageDidem Acet2016-11-173-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24371
* | | | | | | | | | | | | | | Merge branch 'rs-project-archive-doc-fix' into 'master' Achilleas Pipinellis2016-11-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct curl examples for archive and unarchive project API [ci skip] See merge request !7559
| * | | | | | | | | | | | | | | Correct curl examples for archive and unarchive project APIRobert Speicher2016-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan2016-11-1856-86/+1679
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cycle Analytics: Events per stage Adds list of events to each stage: - Issue: list of issues created in the last XX days, that have been labeled or added to a milestone. - Plan: list of commits that reference for the fist time an issue from the last stage. - Code: list of MR created in this stage - Test: List of unique builds triggered by the commits. - Review: List of MR merged - Staging: List of deployed builds - Production: list of issues with the time from idea to production Fixes #23449 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6859
| * | | | | | | | | | | | | | | refactored updater and updated specsJames Lopez2016-11-189-60/+35
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix small typoJames Lopez2016-11-181-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | added new build updater, specs and refactored allowed_idsJames Lopez2016-11-1813-42/+107
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | run pipeline worker in cycle analytics dev setupJames Lopez2016-11-182-1/+3
| | | | | | | | | | | | | | | |