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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add margin to pages where is no headerremove-gray-bg	Dmitriy Zaporozhets	2016-01-14	4	-4/+4
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Update files/diffs to match new layout	Dmitriy Zaporozhets	2016-01-14	6	-6/+6
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Fix files, project settings and few more pages with new layout	Dmitriy Zaporozhets	2016-01-14	4	-5/+6
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Dont use nav-pills. Instead use nav-lists	Dmitriy Zaporozhets	2016-01-13	2	-97/+92
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Replace nav-tabs with nav-links	Dmitriy Zaporozhets	2016-01-13	6	-7/+11
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Apply new layout to user page	Dmitriy Zaporozhets	2016-01-13	3	-69/+71
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Update UI help page with only one nav-link example	Dmitriy Zaporozhets	2016-01-13	1	-17/+0
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Replace all navigation menu with nav-links class	Dmitriy Zaporozhets	2016-01-13	29	-53/+59
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Start moving all navigation to one class	Dmitriy Zaporozhets	2016-01-13	2	-2/+2
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	New layout without background color	Dmitriy Zaporozhets	2016-01-13	4	-24/+34
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Add suport for layout without container	Dmitriy Zaporozhets	2016-01-13	1	-1/+1
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'referenced-merge-requests' into 'master'	Dmitriy Zaporozhets	2016-01-13	3	-7/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge request close message moved and merge request now refered by `!`. Fixes #4161 ![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png) See merge request !2387
\| *	makes message plural for multiple MRs and removes from loop. Duh.	Jacob Schatz	2016-01-12	2	-4/+6
\| \|
\| *	merge request close message moved and merge request now refered by `!`.	Jacob Schatz	2016-01-12	3	-6/+5
\| \|
* \|	Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master'	Dmitriy Zaporozhets	2016-01-13	2	-6/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Comment and close button does not submit comment See merge request !2399
\| * \|	gets merge request discussion working againcomment-and-close-button-does-not-submit-comment	Jacob Schatz	2016-01-12	1	-2/+2
\| \| \|
\| * \|	adds back in discussion.haml.html for issues commenting and ↵	Jacob Schatz	2016-01-12	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|	closing/reopening properly.
\| * \|	removing last chunk of MR ajax changes, rest will be in another MR	Jacob Schatz	2016-01-12	4	-5/+7
\| \| \|
\| * \|	reverting more MR ajax files, will appear in different commit	Jacob Schatz	2016-01-12	3	-25/+30
\| \| \|
\| * \|	reverting _mr_title.html.haml	Jacob Schatz	2016-01-12	1	-16/+10
\| \| \|
\| * \|	reverting _disscusion	Jacob Schatz	2016-01-12	1	-4/+5
\| \| \|
\| * \|	fixes conflicts	Jacob Schatz	2016-01-11	66	-219/+337
\| \|\ \
\| * \| \|	initial json requests instead of HTML	Jacob Schatz	2016-01-07	6	-33/+28
\| \| \| \|
\| * \| \|	adds ajax open and close merges, with discussion/comments working as well	Jacob Schatz	2016-01-05	2	-15/+20
\| \| \| \|
\| * \| \|	adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.	Jacob Schatz	2015-12-29	1	-4/+2
\| \| \| \|
* \| \| \|	Merge branch 'change_milestone_close_copy' into 'master'	Dmitriy Zaporozhets	2016-01-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change milestone close notice copy. Closes #6051 See merge request !2372
\| * \| \| \|	Revert group milestone copychange_milestone_close_copy	Josh Frye	2016-01-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Change milestone close notice copy. Closes #6051	Josh Frye	2016-01-11	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'improve_more_buttons' into 'master'	Jacob Schatz	2016-01-12	3	-4/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve admin area button style A lot of the buttons in the top right in the admin area were too big. This makes those the new `btn-nr` size which seems to look nice. ## User buttons ### Current ![Screen_Shot_2016-01-08_at_2.29.30_PM](/uploads/8920d4a67ff4a20617e5b4d319ba154e/Screen_Shot_2016-01-08_at_2.29.30_PM.png) ### New ![Screen_Shot_2016-01-08_at_2.29.21_PM](/uploads/494741f6e92592ff2c60683f399bb1c1/Screen_Shot_2016-01-08_at_2.29.21_PM.png) ## Project edit button ### Current ![Screen_Shot_2016-01-08_at_2.29.59_PM](/uploads/09a2f8fddc45120510dd10758ce33c51/Screen_Shot_2016-01-08_at_2.29.59_PM.png) ### New ![Screen_Shot_2016-01-08_at_2.30.14_PM](/uploads/93a72a7c42b1974643b1e9ffd3ec8511/Screen_Shot_2016-01-08_at_2.30.14_PM.png) ## Label button ### Current ![Screen_Shot_2016-01-08_at_2.38.09_PM](/uploads/9cff790e1a4e2d650487c9765d0235a4/Screen_Shot_2016-01-08_at_2.38.09_PM.png) ### New ![Screen_Shot_2016-01-08_at_2.38.31_PM](/uploads/9462ff2393249eb762dc7cb92605c733/Screen_Shot_2016-01-08_at_2.38.31_PM.png) cc/ @jschatz1 @creamzy @skyruler See merge request !2351
\| * \| \| \|	Improve admin area button style	Drew Blessing	2016-01-11	3	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'show-ip-addresses' into 'master'	Dmitriy Zaporozhets	2016-01-12	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add user's last used IP addresses to admin page This would help admins figure out from where spam is originating. Screenshot: ![image](/uploads/984005a3a35b7004bd0a363081eb53ba/image.png) See merge request !2381
\| * \| \| \| \|	Add user's last used IP addresses to admin page	Stan Hu	2016-01-12	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would help admins figure out from where spam is originating.
* \| \| \| \| \|	Merge branch 'improve_button_styles' into 'master'	Dmitriy Zaporozhets	2016-01-12	2	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve button styles I noticed a couple of buttons don't match the newer styles. ## Issue edit note form ### Current (cancel button is big) ![Screen_Shot_2016-01-08_at_2.18.29_PM](/uploads/c7928e6644e886090f55cb61076c9e89/Screen_Shot_2016-01-08_at_2.18.29_PM.png) ### Now ![Screen_Shot_2016-01-08_at_2.18.22_PM](/uploads/d15c3c458a08ce5a59c367c7fb379c31/Screen_Shot_2016-01-08_at_2.18.22_PM.png) ## Merge request code discussion ### Current ![Screen_Shot_2016-01-08_at_2.21.37_PM](/uploads/b970ff3e5d9ef5e62f83bb56d5505f8d/Screen_Shot_2016-01-08_at_2.21.37_PM.png) ### Now (Also changed to `btn-save` class which changes to green. This matches everything else) ![Screen_Shot_2016-01-08_at_2.22.01_PM](/uploads/ed520de72177de92efe21d236bb04d24/Screen_Shot_2016-01-08_at_2.22.01_PM.png) cc/ @jschatz1 @skyruler @creamzy See merge request !2350
\| * \| \| \| \|	Improve button styles	Drew Blessing	2016-01-08	2	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'hover-descriptions' into 'master'	Dmitriy Zaporozhets	2016-01-12	1	-5/+9
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adds hover titles to merge request and issue pages Fixes #5899 See merge request !2375
\| * \| \| \| \|	adds hover titles to merge request and issue pageshover-descriptions	Jacob Schatz	2016-01-11	1	-5/+9
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix/ci-linter-sequence-validations' into 'master'	Robert Speicher	2016-01-11	1	-3/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow subsequent validations in CI Linter Closes #5851 See merge request !2368
\| * \| \| \|	Allow subsequent validations in CI Linterfix/ci-linter-sequence-validations	Grzegorz Bizon	2016-01-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #5851
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-01-11	1	-5/+4
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'rs-zenmode-cleanup' into 'master'	Douwe Maan	2016-01-11	1	-5/+4
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor ZenMode - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling. See merge request !2354
\| \| * \| \| \|	Refactor ZenModers-zenmode-cleanup	Robert Speicher	2016-01-08	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling.
* \| \| \| \| \|	Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erb	Douwe Maan	2016-01-11	3	-22/+24
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	use JavaScript instead of CoffeeScript in Views for master
\| * \| \| \| \|	use JavaScript instead of CoffeeScript in Views, the reason #9819	Jason Lee	2016-01-11	3	-22/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-build-status-caching' into 'master'	Dmitriy Zaporozhets	2016-01-11	1	-5/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix caching issue where build status was not updating in project dashboard The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable. Closes #3268 See merge request !2353
\| * \| \| \| \| \|	Fix caching issue where build status was not updating in project dashboard	Stan Hu	2016-01-08	1	-5/+8
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3268
* \| \| \| \| \|	Merge branch 'load-autocomplete-when-needed' into 'master'	Dmitriy Zaporozhets	2016-01-11	1	-3/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only load autocomplete data when actually needed See merge request !2365
\| * \| \| \| \| \|	Only load autocomplete data when actually needed	Yorick Peterse	2016-01-11	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously this would result in autocomplete data being loaded for every page (e.g. the page showing all Git branches of a project).
* \| \| \| \| \| \|	Merge branch 'fix-build-page-typo' into 'master'	Kamil Trzciński	2016-01-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in build page of projects The column containing links to the builds is named Runner but actually contains the Build. See merge request !2347
\| * \| \| \| \| \|	Fix typo in build page of projects	Steffen Köhler	2016-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The column containing links to the builds is named Runner but actually contains the Build ID. [ci skip]
* \| \| \| \| \| \|	Merge branch 'new-branch-position-fix' into 'master'	Dmitriy Zaporozhets	2016-01-11	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes new branch button positioning, when visible and not visible container Fixes #5893 #5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. See merge request !2348