Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 5087f36d23 Merge branch 'annotate' into 'master'
Annotate

See merge request !1040
2014-08-25 10:33:53 +00:00
Dmitriy Zaporozhets 92deb451da Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-25 12:25:02 +03:00
Dmitriy Zaporozhets 2e497d8438 Prevent project stars duplication when fork project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-25 12:19:52 +03:00
Jeroen van Baarsen 652de6f591 Enable highlighting for blame
Fixes #3675

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-08-25 11:11:57 +02:00
Ben Bodenmiller f818218359 add current sign-in date
add current sign-in date to admin section profile view
2014-08-24 23:52:31 -07:00
Ben Bodenmiller 92160789aa add sign-in count
add sign-in count to admin section profile view
2014-08-24 23:47:19 -07:00
Ben Bodenmiller c1eee5968f Monthly active users -> Active users last 30 days
Clarify what `Monthly active users` means by changing to `Active users last 30 days`.
2014-08-24 22:42:46 -07:00
Sytse Sijbrandij 8b1fe5f4ff Merge pull request #7569 from offlinehoster/patch-2
Added AsciiDoc support and changed to singlequotes
2014-08-24 11:57:54 +02:00
Dmitriy Zaporozhets 0cfa8aaf79 Merge pull request #7518 from jvanbaarsen/snippet-charset-fix
Set charset encoding to UTF-8 for snippets
2014-08-23 23:51:13 +03:00
Dmitriy Zaporozhets b0c96ec5a3 Merge branch 'cleaner-login' into 'master'
Cleaner UI for login and signup pages

![Screenshot 2014-08-15 17.51.52](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/fc8bf3c4a4/Screenshot_2014-08-15_17.51.52.png)
![Screenshot 2014-08-15 17.52.39](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/72706f55b0/Screenshot_2014-08-15_17.52.39.png)
![Screenshot 2014-08-15 17.51.33](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/c46f972944/Screenshot_2014-08-15_17.51.33.png)

See merge request !1022
2014-08-23 20:44:07 +00:00
Vinnie Okada 8ed7391cb0 Handle undefined text area values
Check to see if a text area's `val` is defined before trying to call
`replace()` on it.
2014-08-22 10:40:25 -05:00
Christian Sarazin 4a14b5900b Added AsciiDoc support and changed to singlequotes
extension to https://github.com/gitlabhq/gitlabhq/pull/7568
2014-08-22 12:33:58 +02:00
Jacob Vosmaer f2942ffee0 Merge pull request #7555 from erikjwaxx/master
Fix spelling error in merge request performance issue warning.
2014-08-21 11:20:43 +02:00
Erik Weatherwax 1ff781c3c9 Fix spelling error in merge request performance issue warning. 2014-08-20 12:53:19 -04:00
Robert Schilling 64102476dc Call updateColorPreview in Labels constructor 2014-08-20 18:11:51 +02:00
Jacob Vosmaer 3946485765 Merge pull request #7526 from jubianchi/api/issue-api-validate-labels
API: Labels validation in issues API
2014-08-20 15:09:31 +02:00
Jacob Vosmaer 1eaa8e18be Merge pull request #7553 from Razer6/fix_project_description
Fix project description on explore page, fixes #7458
2014-08-20 14:30:58 +02:00
Jacob Vosmaer 16500a2027 Merge pull request #7552 from Razer6/fix_star_button
use default white-space for sidebar buttons, fixes #7549
2014-08-20 14:29:22 +02:00
jubianchi 7ad93ab250 Improve labels validation and expose error messages 2014-08-20 12:09:19 +02:00
Robert Schilling 5e7f5ee8b8 Restyle explore projects to fix #7548 2014-08-20 02:38:52 +02:00
Robert Schilling 6f67923650 use default white-space for sidebar buttons, fixes #7549 2014-08-19 19:01:11 +02:00
Martin Bastien 8eff8bcebf Fix color toggle for labels in edit view 2014-08-18 12:23:45 -04:00
Jacob Vosmaer a2ee746758 Merge pull request #7524 from Razer6/repo_settings_spelling_error
Fix minor spelling error in repo settings page
2014-08-18 17:44:32 +02:00
Robert Schilling 68c87a2de3 Show percentage status on milestone detail page, fixes #485 2014-08-17 21:15:22 +02:00
Robert Schilling 2ca928d49a Fix minor spelling error 2014-08-17 19:58:57 +02:00
Robert Schilling 50c2efea03 don't lookup branch element - it might need to be escaped 2014-08-17 17:05:32 +02:00
Hiroyuki Sato 66c18eaeb3 Fix not rendered the network graph edge. 2014-08-17 22:37:56 +09:00
Jeroen van Baarsen 1b14864549 Set charset encoding to UTF-8 for snippets
Fixes #2678

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-08-16 14:58:53 +02:00
Ciro Santilli 7be7cf2936 Remove unused title parameter.
It is always overridden by to humanized source branch name by
MergeRequests::BuilService, which is used by new_project_merge_request_path.
2014-08-16 12:31:26 +02:00
Dmitriy Zaporozhets d28a27f7c4 Cleaner UI for login/signup pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-15 17:52:20 +03:00
Robert Schilling 938eed1ef8 Consistency: Capitalize hex values of sugested colors 2014-08-15 11:02:05 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api
Implement complete labels API (create/delete/update)
2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 014eff5d8f Merge pull request #7499 from skv-headless/fix-commit-msg
Fix commit msg
2014-08-15 10:23:45 +03:00
Dmitriy Zaporozhets 0602c5d027 Change default label color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-15 10:20:12 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation
Better label color validation, fixes #7454
2014-08-15 10:17:16 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
skv fe46500448 gfm and preserve commit message
for commits#show
2014-08-14 15:20:34 +04:00
skv 3d7b79e454 whitespaceses at beginning of commit messages 2014-08-14 15:19:44 +04:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master'
Remove labels via ajax

See merge request !1019
2014-08-13 18:28:52 +00:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 21:28:22 +03:00
polamjag 100022d3ea append .xmlschema to system hook timestamp 2014-08-14 02:13:14 +09:00
Dmitriy Zaporozhets 540596b7b5 Remove labels with ajax request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 19:47:03 +03:00
Dmitriy Zaporozhets d8b769ec74 Make default sing-in logo smaller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-13 19:36:00 +03:00
Robert Schilling 04ad197bcc Trigger an update of save button if user pressed a preview color 2014-08-13 15:48:26 +02:00
Robert Schilling b9519c8314 Validate label titel in project scope 2014-08-13 15:48:26 +02:00
Robert Schilling c9eaa46c73 Labels need to be valid on name 2014-08-13 15:48:26 +02:00
Robert Schilling a3c969cd92 Add testcase for invalid color 2014-08-13 15:48:26 +02:00
Robert Schilling 6085b6a765 Move label coffeescript from view to class 2014-08-13 15:48:26 +02:00
Robert Schilling 0b5e0e4c55 Disable label submit button if any field is empty 2014-08-13 15:48:26 +02:00