delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add tag shortcut from the Commit page	Akram FARES	2016-10-06	2	-0/+13
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-active	Paco Guzman	2016-10-06	2	-6/+15
\|
*	Merge commit 'dev/security' into 'master'	Rémy Coutable	2016-10-06	1	-0/+1
\|\ \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Enforce the fork_project permission in Projects::CreateService	Nick Thomas	2016-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Projects::ForkService delegates to this service almost entirely, but needed one small change so it would propagate create errors correctly. CreateService#execute needs significant refactoring; it is now right at the complexity limit set by Rubocop. I avoided doing so in this commit to keep the diff as small as possible. Several tests depend on the insecure behaviour of ForkService, so fi them up at the same time.
* \|	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-10-04	3	-66/+1
\|\ \
\| * \	Merge branch 'fix/import-export-admin' into 'master'	Robert Speicher	2016-10-03	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Import/Export for non-admin users Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315 Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !6080
\| \| * \|	Enable import/export back for non-adminsfix/import-export-admin	James Lopez	2016-10-03	1	-0/+1
\| \| \| \|
\| * \| \|	Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-features	Robert Speicher	2016-10-03	2	-66/+0
\| \|/ /
* \| \|	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-10-03	6	-6/+11
\|\ \ \ \| \|/ /
\| * \|	Add organization field to user profile	Dmitriy Zaporozhets	2016-09-27	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'full-width-new-snippet-button' into 'master'	Fatih Acet	2016-09-26	2	-3/+3
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added full-width new snippet button on mobile and corrected capitalization ## What does this MR do? Adds full-width `New snippet` button to snippet mobile views and corrects `New Snippet` to `New snippet` throughout. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? @connorshea Spotted that I missed this in !6210 :) ## Screenshots (if relevant) ![Screen_Shot_2016-09-16_at_10.40.21](/uploads/ddca2da3a5ef787298bfc87e129db820/Screen_Shot_2016-09-16_at_10.40.21.png) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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 you do - 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? See merge request !6380
\| \| *	Added full-width new snippet button on mobile and corrected capitalizationfull-width-new-snippet-button	Luke Bennett	2016-09-18	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Altered specs that click capitalised New Snippet button Applied review feedback missed in Changes `.no-comment` `opactiy: 0.5` to `opacity: .5` Added `.btn-wide-on-xs` and applied to snippet buttons
\| * \|	fix issues mr counter	barthc	2016-09-20	2	-2/+2
\| \|/
\| *	Merge branch 'pipeline-hooks' into 'master'	Rémy Coutable	2016-09-08	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement Slack integration for pipeline hooks ## What does this MR do? Add pipeline events to Slack integration ## 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) - Tests - [x] Added for this feature/bug See merge request !5525
\| \| *	Merge remote-tracking branch 'upstream/master' into pipeline-hooks	Lin Jen-Shin	2016-09-06	4	-29/+23
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (368 commits) Don't fail on an empty database Refactor authorization_for_merge_requests.md Support MySQL too, when removing gitorious from import_sources Remove gitorious from import_sources on ApplicationSetting model Add links to new docs in merge_requests.md and workflow/README.md Move merge request versions to its own document Move "Only allow merge requests to be merged if the build succeeds" to new location Move revert_changes.md to new location Move cherry_pick_changes.md to new location Move `wip_merge_requests.md` to a new location Move merge_when_build_succeeds.md to new location Fix missing flash messages on service edit page Move authorization_for_merge_requests.md to new location Move `workflow/merge_requests.md` to `user/project/merge_requests.md` Update README.md Fix randomly failing specs in expand_collapse_diff_spec: Add link on API docs index page Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 Remove suggested colors hover underline Fix markdown anchor icon interaction ...
\| \| * \	Merge remote-tracking branch 'upstream/master' into pipeline-hooks	Lin Jen-Shin	2016-08-26	4	-6/+5
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (107 commits) Fix external issue tracker "Issues" link leading to 404s Fix CHANGELOG entries related to 8.11 release. Fix changelog Reduce contributions calendar data payload Add lock_version to merge_requests table Add hover color to emoji icon Fix wrong Koding link Capitalize mentioned issue timeline notes Fix groups sort dropdown alignment Use icon helper Fix inline emoji text alignment Adds response mime type to transaction metric action when it's not HTML Moved two 8.11 changelog entries to 8.12 Fix markdown link in doc_styleguide.md Display project icon from default branch Reduce number of database queries on builds tab Update CHANGELOG Update Issue board documentation Label list shows all issues (opened or closed) with that label Update CHANGELOG ...
\| \| * \ \	Merge remote-tracking branch 'upstream/master' into pipeline-hooks	Lin Jen-Shin	2016-08-24	24	-54/+84
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (1174 commits) Added CHANGELOG Added unfold test to parallel and added 'diff discussion' context Fix Spinach branches spec Better first match on this MR also Change merge_error column from string to text type Fix typo in gitlab_flow.md entities: make Environment inherit EnvironmentBasic Updated to optimized specs from !5864 Added 'with an unfolded line should not allow commenting' scenario (line 125) Added addtional 'renderable' validator to check 'data-note-type' attr exists Allow passing an index to selectRowAtIndex Fixed enter key in search input not working Fix file links on project page Files view Fix incorrect "stopped impersonation" log message 8.11 is released, long live 8.12 Also check if Akismet is enabled, before showing the `Submit as spam` button. fix location of markdown help location Fix for update 8.10-to-8.11.md doc. Appease the linter. Add Ruby 2.3 upgrade notes. ...
\| \| * \ \ \	Merge branch 'master' into pipeline-hooks	Lin Jen-Shin	2016-08-02	2	-2/+2
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (145 commits) Add support for relative links starting with ./ or / to RelativeLinkFilter (!5586) Add failing tests for #19028 Update installation guide for 8.11 Update CHANGELOG for 8.10.3 Catch what warden might throw when profiling requests to re-throw it webhooks: include old revision in MR update events Fix search results for notes without commits API methods should be documented using Grape's DSL Update CHANGELOG Fix RequestProfiler::Middleware error when code is reloaded in development Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration Fix specs Trim extra displayed carriage returns in diffs and files with CRLFs Avoid line_code and position calculation on line partial for plain view State specific default sort order for issuables refactored wait_for_archived_file method squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit fix return value and spec squashed - fix timing issues in prod importing projects Minor fixes in the Env API endpoints ...
\| \| * \| \| \| \|	Fix test for checking everything for Slack service	Lin Jen-Shin	2016-07-30	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix issuable_bulk_update_path and merge request spinach test	Dmitriy Zaporozhets	2016-09-08	1	-1/+3
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-09-02	4	-29/+23
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch ↵	Fatih Acet	2016-09-01	2	-26/+17
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttons' into 'master' Update todo view filter dropdowns ## What does this MR do? Swaps out old `select2` dropdowns on todo page with newer dropdowns. Also removes todo inline JS. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Project ![2016-08-29_14.02.57](/uploads/73d610fd41d202540f3770afa7e5266f/2016-08-29_14.02.57.gif) ### Author ![2016-08-29_14.03.40](/uploads/8ce97b81c91db06111f6a930cd5fb293/2016-08-29_14.03.40.gif) ### Type ![2016-08-29_14.04.32](/uploads/1aa050a7822de1d99ee7fdc3bbc621a3/2016-08-29_14.04.32.gif) ### Action ![2016-08-29_14.05.23](/uploads/680d19c56723a222274c3677f941cfcd/2016-08-29_14.05.23.gif) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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 you do - 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 #21508 Related to #19866 See merge request !6072
\| \| * \| \| \| \|	Added todo filter tests21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttons	Luke Bennett	2016-09-01	1	-20/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Removed select2 from todos feature spec	Luke Bennett	2016-09-01	1	-6/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Project tools visibility level	Felipe Artur	2016-09-01	2	-3/+5
\| \|/ / / / /
\| * \| \| \| \|	Fix bug where pagination is still displayed despite all todos marked as done	Clement Ho	2016-08-31	1	-0/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'master' into revert-c676283b	Phil Hughes	2016-08-30	27	-77/+121
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'capitalize-mentioned-issue-notes' into 'master'	Douwe Maan	2016-08-26	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Capitalize mentioned issue timeline notes ## What does this MR do? Renames `mentioned in` to `Mentioned in` for issue timeline notes ## Are there points in the code the reviewer needs to double check? Shouldn't be any :smile: ## Why was this MR needed? Resolves existing UI inconsistency as all the other issue timeline notes have their first letter capitalized. ## What are the relevant issue numbers? Closes #21416 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-25_at_10.52.47_AM](/uploads/61de0a7d65fd739a6e565f6e63d2f52d/Screen_Shot_2016-08-25_at_10.52.47_AM.png) After: ![Screen_Shot_2016-08-25_at_10.52.05_AM](/uploads/f67f353c285453306d6b80578b11e587/Screen_Shot_2016-08-25_at_10.52.05_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6028
\| \| * \| \| \|	Capitalize mentioned issue timeline notes	Clement Ho	2016-08-25	1	-1/+1
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'zj-remove-gitorious' into 'master'	Douwe Maan	2016-08-25	1	-1/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
\| \| * \| \| \|	Remove gitoriouszj-remove-gitorious	Z.J. van de Weg	2016-08-25	1	-1/+0
\| \| \|/ / /
\| * \| \| \|	Merge branch 'dz-merge-request-version'	Douwe Maan	2016-08-25	2	-4/+4
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-22	3	-8/+8
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \ \ \	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-19	5	-8/+8
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \ \ \ \	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-15	18	-40/+64
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Chnage the way how merge request diff is initialized and saved	Dmitriy Zaporozhets	2016-08-02	2	-4/+4
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Fix Spinach branches specfix-spinach-branches-spec	Sean McGivern	2016-08-23	2	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Revert the revert of Optimistic Lockingrevert_revert_issuable_lock	Valery Sizov	2016-08-22	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'expiration-date-on-memberships' into 'master'	Douwe Maan	2016-08-19	2	-4/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expiration date on memberships Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495 See merge request !5876
\| \| * \ \ \ \	Merge branch 'master' into expiration-date-on-memberships	Sean McGivern	2016-08-18	2	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	Add expiration date to group memberships	Sean McGivern	2016-08-18	2	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into expiration-date-on-memberships	Sean McGivern	2016-08-18	19	-44/+68
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Allow to edit access expiration date.	Adam Niedzielski	2016-08-05	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't use global variables.ace-ventura	Connor Shea	2016-08-18	1	-4/+4
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '18334-truncate-award-emoji-users' into 'master'	Jacob Schatz	2016-08-18	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncated long user lists in award emoji tooltips ## What does this MR do? Truncates award emoji tooltips so that they only show 10 users maximum. Further users are indicated by appending "and X more." ## Are there points in the code the reviewer needs to double check? Is 10 too little, should it be raised? My test cases rely on join() to build the expected output. This feels a little iffy is it alright? ## Why was this MR needed? Some issues have a large number of thumbs causing tooltips to be very large. ## What are the relevant issue numbers? closes #18334, closes #19542 ## Screenshots (if relevant) ##### Before ![Screenshot_from_2016-06-20_19-49-12](/uploads/d7a14dd87bb3da2acd7c0818de99852b/Screenshot_from_2016-06-20_19-49-12.png) ##### After ![Screenshot_from_2016-06-20_19-50-58](/uploads/f7f05c44594bfe8cec7dfd48802753a6/Screenshot_from_2016-06-20_19-50-58.png) Truncation point modified for purposes of screenshot ## 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) - [x] API support added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4780
\| \| * \| \| \| \| \|	Award tooltips refer to current user as "You"	Jack Davison	2016-08-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix broken feature spec.fix-issue-filter-spec	Ruben Davila	2016-08-17	1	-1/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This older spec was failing: features/project/issues/issues.feature Looks like before we were doing an exact match for queries, that's why it was passing with this existing issue: https://gitlab.com/gitlab-org/gitlab-ce/blob/59fa031e6f7d5a1b658c370f581c4caaf4493150/features/project/issues/issues.feature#L128 Failed build: https://gitlab.com/gitlab-org/gitlab-ce/builds/3178231
\| * \| \| \| \| \|	Now waits for All issuables to load when clickedremove-sleep-calls-from-phantom-update-spinach-specs	Luke Bennett	2016-08-17	2	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Removed sleep calls introduced in !5740	Luke Bennett	2016-08-17	2	-3/+0
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'fix/import-permissions' into 'master'	Douwe Maan	2016-08-15	2	-3/+2
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set permissions to admin for importing a project via Import/Export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20802 In order to import a project, it is now required to be an admin Moved from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5766 See merge request !1983