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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix/titles-weight' into 'master'	Douwe Maan	2016-01-14	5	-7/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages See #3956. Following is before/after for each page: ## Group title ### Before ![group-title-before](/uploads/d6c013c69f526d553555ff974c29b349/group-title-before.png) ### After ![group-title-after](/uploads/56e0bd176d12943297b5b95d20beb437/group-title-after.png) --- ## Commit title ### Before ![commit-title-before](/uploads/a9bda5212eea843ab4c92acbcf411cdd/commit-title-before.png) ### After ![commit-title-after](/uploads/e3a532460a1e7b0b2a8eb8a6af12abea/commit-title-after.png) --- ## Branch name ### Before ![branch-name-before](/uploads/9d77e39f07cd7b757d02a39f5bc57570/branch-name-before.png) ### After ![branch-name-after](/uploads/6831e9560d196d8a4da209166f224a0f/branch-name-after.png) --- ## Tags name in list ### Before ![tags-name-in-list-before](/uploads/cf0141713af751132fd29220621ea9ab/tags-name-in-list-before.png) ### After ![tags-name-in-list-after](/uploads/902c5b029dc832216ac536d2ad372b83/tags-name-in-list-after.png) --- ## Tag name ### Before ![tags-name-before](/uploads/495acb6b4bab8464a0ffeb8f703435b6/tags-name-before.png) ### After ![tags-name-after](/uploads/f86868dbad57b8226611bcb03e5a9524/tags-name-after.png) --- ## Issue title in list ### Before ![issue-title-in-list-before](/uploads/5f01450aceefdcc2f51984832a4ce6b5/issue-title-in-list-before.png) ### After ![issue-title-in-list-after](/uploads/3144fb231874d23b6b46e108da24b128/issue-title-in-list-after.png) --- ## MR title in list ### Before ![mr-title-in-list-before](/uploads/bd0239104ebf4a5090c724c3851df57c/mr-title-in-list-before.png) ### After ![mr-title-in-list-after](/uploads/16be5460dffc33ff173a6b8ff3250206/mr-title-in-list-after.png) See merge request !2422
\| *	Improve the consistency of commit titles, branch names, tag names, issue/MR ↵fix/titles-weight	Rémy Coutable	2016-01-14	5	-7/+6
\| \| \| \| \| \| \| \|	titles, on their respective project pages
* \|	Merge branch 'feature/ldap-sync-edgecases' into 'master'	Douwe Maan	2016-01-14	1	-10/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
\| * \|	Fix Admin/Users view to position buttons without spacing magic	Gabriel Mazetto	2016-01-14	1	-15/+15
\| \| \|
\| * \|	Prevent ldap_blocked users from being unblocked by the Admin UI	Gabriel Mazetto	2016-01-08	1	-1/+6
\| \| \|
* \| \|	Merge branch 'fix/private-references' into 'master'	Douwe Maan	2016-01-14	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show referenced MRs & Issues only when the current viewer can access them This addresses both issues identified in #6066. ## The private MR by user `remy2` with a note referencing to a public issue ![Screen_Shot_2016-01-12_at_16.45.02](/uploads/c245ec2c1fdea1f9ba05183c24e142d9/Screen_Shot_2016-01-12_at_16.45.02.png) --- ## The public issue viewed by user `remy` who doesn't have access to `remy2/private-project` before the fix ![Screen_Shot_2016-01-12_at_18.14.50](/uploads/8db5580e803f5bddd6cb935233c579a0/Screen_Shot_2016-01-12_at_18.14.50.png) --- ## The public issue viewed by user `remy` who doesn't have access to `remy2/private-project` with the fix ![Screen_Shot_2016-01-13_at_12.02.32](/uploads/cb199f7b78191fba486a11412412e307/Screen_Shot_2016-01-13_at_12.02.32.png) --- ## The public issue viewed by user `remy2` with the fix (no change) ![Screen_Shot_2016-01-13_at_11.54.06](/uploads/ddece590d69f597a95559beddcd36660/Screen_Shot_2016-01-13_at_11.54.06.png) See merge request !2405
\| * \ \	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Rémy Coutable	2016-01-13	15	-23/+45
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \|	fix/private-references
\| * \| \|	Move complex view condition to a model method	Rémy Coutable	2016-01-13	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is moved to a model method rather than an helper method because the API will need it too.
\| * \| \|	Show referenced MRs & Issues only when the current viewer can access them	Rémy Coutable	2016-01-13	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'rs-broadcasts' into 'master'	Douwe Maan	2016-01-14	4	-55/+69
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow broadcast messages to be edited Closes #3046 See merge request !2268
\| * \| \| \|	Remove (invalid) timestamp formattingrs-broadcasts	Robert Speicher	2016-01-13	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Move `BroadcastMessage#status` to a helper since it's presentational	Robert Speicher	2016-01-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Broadcast Messages can now be edited	Robert Speicher	2016-01-13	3	-22/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3046
\| * \| \| \|	Update broadcast_message helper	Robert Speicher	2016-01-13	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now it returns the fully-formatted message so we can be consistent about how it's shown.
\| * \| \| \|	Move broadcast message form to a partial	Robert Speicher	2016-01-13	2	-32/+38
\| \| \| \| \|
\| * \| \| \|	Style the broadcast message form	Robert Speicher	2016-01-13	2	-6/+9
\| \| \| \| \|
\| * \| \| \|	Add js-requires-input to form	Robert Speicher	2016-01-13	1	-3/+2
\| \| \| \| \|
* \| \| \| \|	Fix misaligned edit button in milestone collection partialrs-milestone-buttons	Robert Speicher	2016-01-13	1	-3/+4
\| \| \| \| \|
* \| \| \| \|	Update button styles for Milestones#show	Robert Speicher	2016-01-13	1	-6/+6
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Added hint that you can search users by name, username, or email.	Patricio Cano	2016-01-13	2	-2/+2
\|/ / /
* \| \|	Merge branch 'configure-randomize-metrics-sample-interval' into 'master'	Yorick Peterse	2016-01-13	1	-0/+7
\|\ \ \ \| \| \| \| \| \| \| \|	See merge request !2406
\| * \| \|	Make the metrics sampler interval configurable	Yorick Peterse	2016-01-13	1	-0/+7
\| \| \| \|
* \| \| \|	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
\|\ \ \ \ \