Commit Graph
1061 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 18e4e99764 Merge branch 'sha-link' of https://github.com/cirosantilli/gitlabhq into cirosantilli-sha-link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-09-04 15:47:54 +03:00
Dmitriy Zaporozhets 5f6eb09cdf Improve issue filtering. Make tests pass
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-03 19:18:23 +03:00
Dmitriy Zaporozhets a563065f3e Merge pull request #7523 from Razer6/fix_branch_delete
Fix branch remove for branches containing a '/'
2014-09-03 14:01:57 +03:00
Dmitriy Zaporozhets 4102eb3b85 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 16:20:10 +03:00
Dmitriy Zaporozhets 99425a124c Post comment when hit close/reopen btn in comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-01 15:37:53 +03:00
Dmitriy Zaporozhets 31773f4dd7 Merge branch 'milestone_percentage' into 'master'
Show milestone percentage in detail page, fixes #485

#### What does this MR do?

This MR adds the percentage count also to the milestone detail page.

##### Why was this MR needed?

Currently, this is only shown in the overview list.

##### What are the relevant issue numbers?

#485

###### Screenshots

![Screenshot 2014-08-17 21.14.27](https://gitlab.com/uploads/razer6/gitlab-ce/27e6f20bf2/Screenshot_2014-08-17_21.14.27.png)

See merge request !170
2014-09-01 11:35:43 +00:00
Dmitriy Zaporozhets 8235d3ecdf Merge pull request #7659 from Razer6/feature/shortcuts
Awesome keyboard shortcuts for GitLab
2014-09-01 13:47:44 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Ciro Santilli 81336bd2b5 Add permalink to fixed SHA URL on blob view. 2014-09-01 10:26:47 +02:00
Achilleas Pipinellis a870bc9ddf Modify empty project instructions to use double quotes for commit msg.
http://feedback.gitlab.com/forums/176466-general/suggestions/6006904-modify-instruction-to-use-double-quotes-for-windo
2014-08-31 01:08:01 +03:00
Dmitriy Zaporozhets dae9faf340 Merge pull request #7519 from jvanbaarsen/enable-blame-highlighting
Enable highlighting for blame
2014-08-29 17:38:50 +03:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets ef4848a6ff Merge pull request #7609 from cirosantilli/rm-haml-strings
[refactor] Remove HAML eval for const strings.
2014-08-28 16:52:18 +03:00
Dmitriy Zaporozhets 1438285de1 Merge pull request #7601 from yglukhov/hide_pass
Mask password in import URL while importing.
2014-08-28 16:50:19 +03:00
Dmitriy Zaporozhets 22a7fcab8c Merge pull request #7620 from zzet/patch-11
Add search in textarea
2014-08-28 16:49:42 +03:00
Dmitriy Zaporozhets da55f2d9b0 Fix fork button for project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-28 16:46:06 +03:00
Dmitriy Zaporozhets 8289308933 Restyle project home
* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-28 14:19:11 +03:00
Andrew Kumanyaev 0534d75a84 Add search in textarea
https://github.com/ajaxorg/ace/blob/master/lib/ace/commands/default_commands.js#L176-L181
2014-08-28 11:40:05 +04:00
uran e9015dfbc9 Mask password in import URL while importing. 2014-08-27 18:04:18 +03:00
Dmitriy Zaporozhets d4d723caee Merge pull request #7616 from yglukhov/fix-parallel-diff-on-new-mr
Fixed parralel diff button on 'merge_requests/new' page
2014-08-27 17:31:38 +03:00
uran f44a68a004 Fixed parralel diff button on 'merge_requests/new' page 2014-08-27 17:00:15 +03:00
Yuriy Glukhovanduran 0bf45aece3 Added a checkbox to toggle line wrapping in diff. 2014-08-27 11:21:58 +03:00
Ciro Santilli 15c8967238 Remove HAML eval for const strings. 2014-08-26 18:01:46 +02:00
Dmitriy Zaporozhets 04a87cb5c4 Round avatars for notes timeline
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:15 +03:00
Dmitriy Zaporozhets a7dcf690fb Fix discussion style for timeline
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:14 +03:00
Dmitriy Zaporozhets 207d798dc4 Basic UI implememntation of comments in timeline style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:14 +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
Erik Weatherwax 1ff781c3c9 Fix spelling error in merge request performance issue warning. 2014-08-20 12:53:19 -04: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
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 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
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
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
Dmitriy Zaporozhets e24589a165 Merge pull request #7308 from Azaret/fix_milestone_description_max_length
Fix milestones description's max length
2014-08-13 16:43:04 +03:00
Dmitriy Zaporozhets 423390a2c7 Separate accept MR settings from manual merge instructions. Remove confusing click here links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-12 11:48:58 +03:00
Dmitriy Zaporozhets 4535db04b2 Increase import timeout from 2 to 4 minutes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-11 20:58:39 +03:00
Dmitriy Zaporozhets 9238616d6f Merge pull request #7468 from Razer6/fix_wrong_compare_message
Turn if/else branch for valid compare error message
2014-08-11 13:11:00 +03:00
Dmitriy Zaporozhets 505203e7d5 Merge pull request #7466 from Razer6/improve_markup_handling
Improve readme markup,  fixes #7455
2014-08-11 13:02:24 +03:00
Robert Schilling d7701a263f Move calls to Gitlab::MarkdownHelper to application_helper 2014-08-11 11:59:36 +02:00
Dmitriy Zaporozhets 91d6f916c7 Merge pull request #7432 from Razer6/disable_comment_btn_if_empty
Disable 'Save changes' button if input is empty, fixes #6351
2014-08-11 12:40:48 +03:00
Robert Schilling 13c17ed494 Turn if/else branch vor valid compare error message 2014-08-11 09:41:05 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Robert Schilling 0e3f8ea2ef Use simple_format if we don't have a proper renderer 2014-08-10 14:33:22 +02:00
Ben Bodenmiller 66f8a44fd3 make bullet punctuation consistent 2014-08-04 20:51:26 -07:00