summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Un-un-revert signin tab order fix.super-secret-login-upgradeBryce Johnson2016-11-182-25/+2
|
* Merge branch '24641-focus-state' into 'master' fix/use-authorized-projects-project-teamAnnabel Dunstone Gray2016-11-181-2/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix focus state in preview tab ## What does this MR do? Fixes the focus border in the preview tab by modifying the `line-height`, keeping the same height :cartwheel: ## Screenshots (if relevant) ![Screen_Shot_2016-11-18_at_18.35.36](/uploads/3ef96699194704f030cc8d2b5132226c/Screen_Shot_2016-11-18_at_18.35.36.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 - [ ] 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 #24641 See merge request !7581
| * Fix focus state in preview tabFilipa Lacerda2016-11-181-2/+7
| | | | | | | | | | | | | | | | Adds MR ID to changelog entry Removes changelog entry Fixes after review
* | Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan2016-11-1827-51/+336
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Precalculate authorized projects in database ## What does this MR do? It caches user's authorized projects in database instead of using multiple unions, which should simplify and speed-up things since this operation (getting authorized projects) is used a lot. ## Are there points in the code the reviewer needs to double check? Did we miss a scenario where we need to refresh the list of projects? ## Does this MR meet the acceptance criteria? - [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)~~ - [ ] ~~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? #23150 See merge request !6839
| * | Precalculate user's authorized projects in databaseAhmad Sherif2016-11-1827-51/+336
| | | | | | | | | | | | Closes #23150
* | | Merge branch 'less-intrusive-system-note' into 'master' Fatih Acet2016-11-188-28/+153
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less intrusive system note ## What does this MR do? This MR is for making system notes less intrusive by implementing proposed design ## Are there points in the code the reviewer needs to double check? System notes are reusing in issues, commits and MR discussions. May need to double check to make sure that the design is not breaking anywhere ## Why was this MR needed? This merge request solve issue #19797 ## Screenshots (if relevant) **Before:** ![merge-request-before](/uploads/91953598087a613078d80333a43815a7/merge-request-before.png) **After** ![2016-11-15_17.41.46](/uploads/c809ba53cc34ee83bb439ed741dc39f3/2016-11-15_17.41.46.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [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 - [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? #19797, #23129 See merge request !6755
| * | | makes system notes less intrusive to a conversationless-intrusive-system-noteNur Rony2016-11-178-28/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds dicussion icon and color change in system note links adds discussion icons and sticky note icon for other system notes for now fixes scss lint error adds faded commit lists hides first paragraph in commit list box css tweak for commit list system notes adds commit-list toggle functionality, css tweaks and css classnames more readable small css fix in header. makes links bold in system note renames class no-shade to hide-shade adds entry for this merge request in changelog removes commented line removes the avatar-icon from discussion header minor css tweaks to make the commit list alignment with header text uses monospaced font to make the commit list lined up with all removes icon from system note and align bullet list resolves scss lint warings adds helper function to extract system note message from first p tag adds helper functions to check commit list count and haml cleanup adds changelog entry under 8.14 adds changelog entry with changelog cli removes helper and regex and makes commit list li count using JS makes link in system note normal brakeman build failure resolved fixing rspec test based on new design for discussion shows system note in lowercase removes extra spaces from comments adds code commenting for functions adds semi-colon in some lines fixes rspec given when merge build success removes commented codes rewrite changelog yml file moves isMetaKey to common utils file fixes some indentation issues removes unnecessary variables and resolves some discussions replaces jQuery parent function with siblings fixes scss issues and variable spelling mistake uses constant rather using hardcoded number for visible li count in long commit list makes system note header all lowercase uses color variables and adjust gradient a little some minor changes for adding css classes renames functions name for readability changes changelog title minor scss newline changes makes system note less intrusive to a conversation
* | | | Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-1826-29/+756
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slash command for mattermost Closes #22540 ## 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) - 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) See merge request !7438
| * | | | Rename mattermost_command to mattermost_slash_commandszj-slash-commands-mattermostKamil Trzcinski2016-11-187-15/+15
| | | | |
| * | | | Fix typosZ.J. van de Weg2016-11-184-23/+13
| | | | |
| * | | | Return a consistent not found messageZ.J. van de Weg2016-11-186-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | This prevents leakage of project names on an endpoint which is unauthenticated and thus open to the world.
| * | | | Improve style, add more testsZ.J. van de Weg2016-11-1810-29/+38
| | | | |
| * | | | Projects have chat servicesZ.J. van de Weg2016-11-182-0/+2
| | | | |
| * | | | More coverage on service levelZ.J. van de Weg2016-11-188-9/+177
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-17311-892/+3128
| |\ \ \ \
| * | | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-1712-54/+85
| | | | | |
| * | | | | Add tests for increased converageZ.J. van de Weg2016-11-178-37/+45
| | | | | |
| * | | | | Remove some commands for nowZ.J. van de Weg2016-11-1712-200/+30
| | | | | |
| * | | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-1715-91/+151
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Rename from service, and move to lib/gitlabZ.J. van de Weg2016-11-1723-177/+233
| | | | | |
| * | | | | Refactor and test Slash commandsZ.J. van de Weg2016-11-1718-241/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the structure Kamil proposed, which leaves us with a bunch of smaller classes. This commits deletes outdated files and tests everything from the SlashCommandService and down (child classes and subcommands)
| * | | | | First steps on refactoring Mattermost Slash commandsZ.J. van de Weg2016-11-1714-260/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, each subcommand has its own service, plus I've introduced presenters to be able to delegate the generation of the views.
| * | | | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-179-35/+92
| | | | | |
| * | | | | Remove duplication of implementationsZ.J. van de Weg2016-11-175-28/+3
| | | | | |
| * | | | | Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-172-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | them [ci skip]
| * | | | | Add issue create subcommandZ.J. van de Weg2016-11-173-7/+27
| | | | | |
| * | | | | fixup! issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-174-5/+5
| | | | | |
| * | | | | issue and mergerequest slash command for mattermostZ.J. van de Weg2016-11-1712-1/+455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes a couple of thing: - A chatops controller - Mattermost::CommandService - Mattermost::Commands::(IssueService|MergeRequestService) The controller is the point where mattermost, and later slack will have to fire their payload to. This in turn will execute the CommandService. Thats where the authentication and authorization should happen. So far this is not yet implemented. This should happen in later commits. Per subcommand, in case of `/gitlab issue show 123` issue whould be the subcommand, there is a service to parse the data, and fetch the resource. The resource is passed back to the CommandService which structures the data.
| * | | | | Fix `chat_names` before_actionKamil Trzcinski2016-11-171-1/+1
| | | | | |
| * | | | | 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