summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Update button styles for Milestones#showRobert Speicher2016-01-131-6/+6
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Added hint that you can search users by name, username, or email.Patricio Cano2016-01-132-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-132-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | See merge request !2406
| * | | | | | | | | | Make the metrics sampler interval configurableYorick Peterse2016-01-132-0/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-132-6/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL; https://github.com/gitlabhq/gitlabhq/pull/9964 @DouweM See merge request !2383
| * | | | | | | | | | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-122-6/+6
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
* | | | | | | | | | | Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable milestone filter to stick See merge request !2241
| * | | | | | | | | | enable milestone filter to stickGreg Smethells2016-01-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-136-8/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | changes `$quote-gray` to `$secondary-text`referenced-merge-requestsJacob Schatz2016-01-122-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-123-5/+11
| | | | | | | | | | | |
| * | | | | | | | | | | merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-125-6/+11
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-block-user-before-removal' into 'master' Dmitriy Zaporozhets2016-01-132-4/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block the reported user before destroying the record This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117 See merge request !2402
| * | | | | | | | | | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-122-4/+7
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117
* | | | | | | | | | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' Dmitriy Zaporozhets2016-01-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure time_ago_with_tooltip is using a Time object Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge. See merge request !2398
| * | | | | | | | | | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-121-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
* | | | | | | | | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-135-21/+37
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment and close button does not submit comment See merge request !2399
| * | | | | | | | | | | gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-123-4/+24
| | | | | | | | | | | |
| * | | | | | | | | | | adds back in discussion.haml.html for issues commenting and ↵Jacob Schatz2016-01-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closing/reopening properly.
| * | | | | | | | | | | removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-125-5/+17
| | | | | | | | | | | |
| * | | | | | | | | | | reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-123-25/+30
| | | | | | | | | | | |
| * | | | | | | | | | | reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-122-16/+2
| | | | | | | | | | | |
| * | | | | | | | | | | reverting _mr_title.html.hamlJacob Schatz2016-01-121-16/+10
| | | | | | | | | | | |
| * | | | | | | | | | | reverting merge_request_controllerJacob Schatz2016-01-121-9/+2
| | | | | | | | | | | |
| * | | | | | | | | | | restores merge request coffee fileJacob Schatz2016-01-121-49/+0
| | | | | | | | | | | |
| * | | | | | | | | | | reverting _disscusionJacob Schatz2016-01-121-4/+5
| | | | | | | | | | | |
| * | | | | | | | | | | fixes conflictsJacob Schatz2016-01-11217-907/+1391
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | initial json requests instead of HTMLJacob Schatz2016-01-0710-39/+66
| | | | | | | | | | | | |
| * | | | | | | | | | | | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-055-25/+67
| | | | | | | | | | | | |
| * | | | | | | | | | | | removes commented out code.Jacob Schatz2015-12-301-2/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.Jacob Schatz2015-12-293-19/+15
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'add_username_to_user_system_hooks' of ↵Dmitriy Zaporozhets2016-01-131-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tbeadle/gitlabhq Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Include user_username in user_(add_to/remove_from)_(project/group) system hooks.Tommy Beadle2016-01-071-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Include the username in user_create/destroy system hooks.Tommy Beadle2016-01-071-1/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #9952 from tbeadle/user_id_in_member_system_hookDmitriy Zaporozhets2016-01-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the user_id in user_*_team system hooks.
| * | | | | | | | | | | | | Include the user_id in user_*_team system hooks.Tommy Beadle2016-01-061-0/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the user_id is not included in the data for user_add_to_team and user_remove_from_team system hooks. The documentation already states that the user_id should be included.
* | | | | | | | | | | | | Mention channel/key bug in irkerd docsLandon2016-01-121-3/+4
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per this issue: https://gitlab.com/esr/irker/issues/2 A documentation update was added to irkerd (https://gitlab.com/esr/irker/commit/190808c37d4ab5f0f16fe35352ff36863c2732d5) but the bug is still there. Making a note of it here could save someone a lot of hassle. This could probably be worded better if someone else wants to take a stab at it.
* | | | | | | | | | | | Merge branch 'change_milestone_close_copy' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change milestone close notice copy. Closes #6051 See merge request !2372
| * | | | | | | | | | | | Revert group milestone copychange_milestone_close_copyJosh Frye2016-01-121-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Change milestone close notice copy. Closes #6051Josh Frye2016-01-112-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'improve_more_buttons' into 'master' Jacob Schatz2016-01-123-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 styleDrew Blessing2016-01-113-4/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'show-ip-addresses' into 'master' Dmitriy Zaporozhets2016-01-121-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 pageStan Hu2016-01-121-0/+16
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would help admins figure out from where spam is originating.
* | | | | | | | | | | | | Merge branch 'improve_button_styles' into 'master' Dmitriy Zaporozhets2016-01-123-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 stylesDrew Blessing2016-01-083-4/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'hover-descriptions' into 'master' Dmitriy Zaporozhets2016-01-121-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-descriptionsJacob Schatz2016-01-111-5/+9
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes bolded on active for dropdowns, sitewide. Fixes #6056 <br/> **Note:** this change applies to all dropdowns. Currently all dropdowns using bootstrap's dropdown.js apply a bold and larger font for an active state. See merge request !2377
| * | | | | | | | | | | | | | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
| | | | | | | | | | | | | | |