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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add visibility icon4424-improve-ui-admin-area	Alfredo Sumaran	2016-07-14	1	-0/+3
\|
*	Make admin/groups view consistent with dashboard/groups	Alfredo Sumaran	2016-07-14	1	-17/+20
\|
*	Rename .group-controls to .controls	Alfredo Sumaran	2016-07-14	1	-1/+1
\|
*	Remove unnecesary CSS class	Alfredo Sumaran	2016-07-14	2	-2/+2
\|
*	Add margin between buttons if both retry and cancel are present	Annabel Dunstone	2016-07-14	1	-6/+7
\|
*	Merge branch 'fix/persistent-import-data' into 'master'	Fatih Acet	2016-07-14	2	-2/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import_data being saved as a result of an invalid import_url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19479 Seem that in all cases the `import_url` was an empty string. The `import_url` is now validated correctly and no longer creates the `import_data`even if it fails validation. <= Should cover cases 1, 3, and 4 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 Also, it now rescues from all exceptions when importing from a URL, so we make sure the `import_status` is failed after that. Covers case 2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/19479#note_13005276 See merge request !5206
\| *	udpated JS based on feedbackfix/persistent-import-data	James Lopez	2016-07-14	1	-5/+2
\| \|
\| *	some JS magic to fix empty URL bug	James Lopez	2016-07-13	2	-2/+10
\| \|
* \|	Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master'	Fatih Acet	2016-07-14	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added shortcut to focus filters ## What does this MR do? Adds shortcut `f` to focus filter inputs. ## Are there points in the code the reviewer needs to double check? Is this a valid implementation? Please check [this comment below](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4570#note_12359978)! ## Why was this MR needed? Keyboard ninja UX :crossed_swords: ## What are the relevant issue numbers? Closes #18120. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.34.56](/uploads/d4cfb6ec340c118f5227be3f16ffbed1/Screen_Shot_2016-06-09_at_18.34.56.png) ## 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 - [ ] Added for this feature/bug - [ ] 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 !4763
\| * \|	Added shortcut to focus all search tags apart from the top nav search	Luke "Jared" Bennett	2016-07-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated CHANGELOG Added docs for filter shortcut Moved CHANGELOG entry Added phils fixes Fixed search form submitting with empty input Added review fixes Readability and selector perf fix
* \| \|	Merge branch 'top-links-label' into 'master'	Fatih Acet	2016-07-14	1	-9/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aria labels on top header links ## What does this MR do? Added `aria-label` to the links in top header bar for accessibility. ## What are the relevant issue numbers? Closes #12797 See merge request !5205
\| * \| \|	Aria labels on top header linkstop-links-label	Phil Hughes	2016-07-12	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12797
* \| \| \|	Improves left static sidebar behaviour	Dmitriy Zaporozhets	2016-07-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	List of changes: * removed bottom 50px space that is no longer necessary with pin button at the top * increased side padding so sidebar links are closer to counters * use fixed weight pin icon so it correctly aligned with counters Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Revert "Merge branch '18193-developers-can-merge' into 'master' "	Robert Speicher	2016-07-13	4	-13/+1
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
* \| \|	Implement last round of review comments from !4892.18193-developers-can-merge	Timothy Andrew	2016-07-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Fix typos, minor styling errors. 2. Use single quotes rather than double quotes in `user_access_spec`. 3. Test formatting.
* \| \|	Don't ask the user to "merge this request manually".	Timothy Andrew	2016-07-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	1. If they are a developer with "Developers can Merge" switched on.
* \| \|	Added "developers can merge" setting to protected branches	Mathias Vestergaard	2016-07-13	3	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Cherry-picked from `mvestergaard:branch-protection-dev-merge` - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220
* \| \|	Merge branch '19692-gray-block' into 'master'	Jacob Schatz	2016-07-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update header block class on snippets page ## What does this MR do? Changes gray block in `Snippets` to new white sub header style ## What are the relevant issue numbers? Closes #19692 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_4.17.10_PM](/uploads/f4cea2d019d30fc7c6adc7e3b26590b4/Screen_Shot_2016-07-11_at_4.17.10_PM.png) See merge request !5192
\| * \| \|	Update header block class on snippets page19692-gray-block	Annabel Dunstone	2016-07-11	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '17760-pipeline-builds-design' into 'master'	Jacob Schatz	2016-07-12	11	-105/+123
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Design updates for Builds & Pipelines" ## What does this MR do? Updates pipelines design ## What are the relevant issue numbers? Part of #18920 Closes #17760 Closes #18479 Closes #19618 ## Screenshots (if relevant) ![Screen_Shot_2016-07-11_at_2.44.22_PM](/uploads/5048928d86093802d84c3bd7f7c5dc85/Screen_Shot_2016-07-11_at_2.44.22_PM.png) ![Screen_Shot_2016-07-11_at_2.32.17_PM](/uploads/a7ab94c8042d33bd06ef633f62bf1c99/Screen_Shot_2016-07-11_at_2.32.17_PM.png) ![Screen_Shot_2016-07-11_at_2.44.43_PM](/uploads/8aa63229ad75d373c30f342d5c86c007/Screen_Shot_2016-07-11_at_2.44.43_PM.png) See merge request !5156
\| * \| \| \|	Update duration representation on builds pages	Annabel Dunstone	2016-07-12	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix label alignment bug; re-add build-link	Annabel Dunstone	2016-07-12	2	-16/+16
\| \| \| \| \|
\| * \| \| \|	Add new stopwatch and commit icons; rename custom icon helper; fix commit ↵	Annabel Dunstone	2016-07-12	7	-10/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pipeline layout
\| * \| \| \|	Rearrange and update admin builds	Annabel Dunstone	2016-07-12	4	-48/+47
\| \| \| \| \|
\| * \| \| \|	Update builds page	Annabel Dunstone	2016-07-12	2	-46/+42
\| \| \| \| \|
\| * \| \| \|	Add link to pipline ID	Annabel Dunstone	2016-07-12	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Add empty deploy dropdown button	Annabel Dunstone	2016-07-12	1	-9/+19
\| \| \| \| \|
\| * \| \| \|	Set width on stage columns; min width on table with scroll on mobile; add ↵	Annabel Dunstone	2016-07-12	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	avatar to commit column
\| * \| \| \|	Move pipeline ID to commit column; add status; branch style updates	Annabel Dunstone	2016-07-12	2	-6/+7
\| \| \| \| \|
\| * \| \| \|	Add clock and calendar icons for duration and finished at; add finished at ↵	Annabel Dunstone	2016-07-12	3	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	section in pipelines
* \| \| \| \|	Merge branch 'rs-delimit-done-todos' into 'master'	Robert Speicher	2016-07-12	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use number_with_delimiter for Todos pending/done tab counts See merge request !5199
\| * \| \| \| \|	Use number_with_delimiter for Todos pending/done tab counts	Robert Speicher	2016-07-12	1	-2/+2
\| \|/ / / /
* \| \| \| \|	Merge branch '18935-pipeline-button' into 'master'	Jacob Schatz	2016-07-12	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change new pipeline to run pipeline ## What does this MR do? Change text of button from `New pipeline` to `Run pipeline` ## What are the relevant issue numbers? Closes #18935 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-06_at_12.15.36_PM](/uploads/2e0413b802118781dc5a29c7f1c105b8/Screen_Shot_2016-07-06_at_12.15.36_PM.png) See merge request !5119
\| * \| \| \|	Change new pipeline to run pipeline18935-pipeline-button	Annabel Dunstone	2016-07-06	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '19659-sidebar-improvements' into 'master'	Jacob Schatz	2016-07-12	3	-27/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Possible sidebar improvements based" ## What does this MR do? Cleans up the sidebar ## Are there points in the code the reviewer needs to double check? @dzaporozhets it looks like your screenshot has more padding on the left and right of the sidebar, but if you do that then the hamburger icon doesn't match the placement on the top nav, and it makes it look like icon is shifting back and forth. ## What are the relevant issue numbers? Part of #19659 ## Screenshots (if relevant) ![nav](/uploads/693d8a21bac464fc7dd40a51cb7dccda/nav.gif) See merge request !5211
\| * \| \| \| \|	Remove toggle partial; Move pin link to top of side nav	Annabel Dunstone	2016-07-12	2	-7/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Remove icons from sidebar; remove darker theme color from pin & toggle buttons	Annabel Dunstone	2016-07-12	1	-20/+0
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Optimistic locking for Issue and Merge Requests	Valery Sizov	2016-07-12	1	-0/+9
\| \| \| \| \|
* \| \| \| \|	Remove the group avatar link.remove-group-avi-link	Connor Shea	2016-07-12	1	-2/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For group pages, e.g. https://gitlab.com/groups/gitlab-org, I see no reason to link to the avatar image itself when clicking on the avatar. If the user really wants to open the image, they can do so by right clicking and opening the image in a new tab.
* \| \| \|	Merge branch 'dz-rename-personal-access-tokens' into 'master'	Dmitriy Zaporozhets	2016-07-12	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename profile navigation tab 'Personal Access Tokes' to 'Access Tokens' For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3749#note_12994215. We should not use more than 2 words for tab name See merge request !5187
\| * \| \| \|	Update Access Tokens link title to match the text	Dmitriy Zaporozhets	2016-07-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Rename profile navigation tab 'Personal Access Tokes' to 'Access Tokens'dz-rename-personal-access-tokens	Dmitriy Zaporozhets	2016-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'dz-small-ui-improvements' into 'master'	Dmitriy Zaporozhets	2016-07-12	3	-3/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove icons from some buttons which already has text Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 * remove plus icon from new milestone button on group milestone page * remove plus icon from new project button on group projects page * remove plus icon from milestone page See merge request !5050
\| * \| \| \| \|	Remove icons from some buttons which already has text	Dmitriy Zaporozhets	2016-07-01	3	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'copy-to-clipboard-tooltip' into 'master'	Rémy Coutable	2016-07-12	2	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display tooltip for "Copy to Clipboard" button ## What does this MR do? Add a tooltip to the "Copy to Clipboard" button. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? There was no tooltip. ## What are the relevant issue numbers? fixes #19640, #19682 ## Screenshots (wrong cursor is the fault of my screenshot program) ![after](/uploads/6b89790fa3a32b06b115ef1461cbcd86/after.png) See merge request !5164
\| * \| \| \| \| \|	Display tooltip for "Copy to Clipboard" button (!5164)	winniehell	2016-07-11	2	-4/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'quick-start-ci-route' into 'master'	Douwe Maan	2016-07-12	31	-36/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make "Get started with Builds" Help Page link work properly `help_page_path('ci/quick_start', 'README')` causes a link to `https://gitlab.com/help/ci%2Fquick_start/README` which in turn breaks every relative link on the page. This remedies the problem. That said, this is probably a horrible way of fixing this issue, but it does work. I can’t find much information on linking this deeply with Rails routes. If anyone has suggestions as to a better way of handling this, I'll gladly take them. I tried a few different things, but none of them really worked. Resolves #14872. cc: @axil @rspeicher @elstamey See merge request !3561
\| * \| \| \| \| \|	Fix failing tests.	Connor Shea	2016-07-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update the help_page_path route to accept paths directly instead of using ↵	Connor Shea	2016-07-11	31	-35/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	parameters.
\| * \| \| \| \| \|	Make "Get started with Builds" Help Page link work properly	connorshea	2016-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is probably a horrible way of fixing this issue, but it does work. I can’t find much information on linking this deeply with Rails routes. Resolves #14872.