Commit Graph
72 Commits
Author SHA1 Message Date
Douwe Maan 07c39c9976 Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'
Add graphs of commits ahead/behind default branch (by @brunsa2)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716

See merge request !2301
2016-01-05 15:44:22 +00:00
Douglas Barbosa Alexandre 1757e6ef65 Add JS validation for invalid characters in branch name
More info about valid ref names:

https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht
ml
2015-12-17 17:17:37 -02:00
Douglas Barbosa Alexandre c91cf1f66b Remove the hint on the branch name input 2015-12-16 16:48:14 -02:00
Douglas Barbosa Alexandre 9c266d4935 Add more descriptive error message when create branch with invalid name 2015-12-16 16:34:03 -02:00
Douwe Maan dddfbb653e Merge branch 'master' into ui/misc 2015-12-07 13:48:18 +01:00
Jeff Stubler 932a7fd96f Merge branch 'master' into diverging-branch-graphs 2015-12-03 21:53:06 -06:00
Douwe Maan 7d3edf2520 Merge branch 'master' into ui/misc 2015-12-03 13:27:39 +01:00
Douwe Maan 0520cd7164 Merge branch 'master' into ui/form-consistency 2015-12-03 13:21:19 +01:00
Douwe Maan d8a0e4538d Add tooltip to branch delete button 2015-12-02 15:00:28 +01:00
Douwe Maan 0827455710 Move branch list info tags out of main link 2015-12-02 14:58:27 +01:00
Douwe Maan a3da3d8e3b Use monospace font for commit SHA in branch list 2015-12-02 14:55:29 +01:00
Douwe Maan 90df3701e7 Add plus icon to all "Add X" buttons 2015-12-02 14:54:50 +01:00
Douwe Maan c0e614d1c4 Rename variable 2015-12-02 14:41:57 +01:00
Douwe Maan a70c507882 Only use input placeholders when they add value 2015-12-02 14:41:55 +01:00
Douwe Maan 67119e15c0 Use consistent casing for form field labels 2015-12-02 14:41:54 +01:00
Douwe Maan ed74fa73e2 Use consistent casing for page titles 2015-12-02 14:41:54 +01:00
Rubén Dávila 55c2a69f5f Update copy used in alert message when deleting branches or tags. #2993 2015-11-19 16:22:41 -05:00
Jeff Stubler 64ca9cf3e4 Merge branch 'master' into diverging-branch-graphs 2015-11-12 09:05:29 -06:00
Jeff Stubler e0c64fac68 Refactor for style issues 2015-11-11 16:29:29 -06:00
Dmitriy Zaporozhets 850bb21b12 Create show page for tag and render release notes there and on index page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-05 13:49:34 +01:00
Jeff Stubler c843722de2 Add graphs showing commits ahead and behind default to branches page 2015-11-01 11:38:00 -06:00
Douwe Maan d89ae7df2c Move project header title definition to view in question. 2015-09-17 12:16:24 +02:00
Dmitriy Zaporozhets aa6d29f0a7 Style commits, branches and tags pages to match new UI 2015-09-07 11:44:00 +02:00
Florent (HP) 8adf6ba8f5 Add merged label on branches page 2015-08-11 23:00:46 +02:00
Robert Speicher f6503f71f9 Remove disableButtonIf[Any]EmptyField calls from forms
These have been replaced by the "requiresInput" behavior.
2015-06-26 22:07:59 -04:00
Douwe Maan 164d474488 Add Merge Request button to branches page. 2015-05-09 22:55:19 +02:00
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Dmitriy Zaporozhets 29970204ea Fix button overflow for branches/tags pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-14 16:26:47 +03:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets 519ca7bae9 Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button
Conflicts:
	app/views/shared/_issuable_filter.html.haml
2015-03-02 15:28:22 -08:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Ciro Santilli 55d9809055 Convert Javascript links to buttons. 2015-01-17 19:50:41 +01:00
uranandyglukhov b34e83d261 Corrected validation of 'Create branch' and 'Create tag' buttons 2014-12-23 16:04:39 +02:00
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag
Use button type=submit instead of input.
2014-10-28 12:11:15 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 6294033024 Use button type=submit instead of input. 2014-10-01 11:12:56 +02:00
Dmitriy Zaporozhets 1767873845 Merge pull request #7193 from dloman/master
added htmlsafe to branch list
2014-09-05 15:51:18 +03:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API
Add specs for GitRefValidator
2014-09-03 13:08:35 +02:00
Daniel Loman b816491356 added str-truncated to branch list to fix issue #7192 2014-09-01 15:16:55 -07:00
Robert Schilling 50c2efea03 don't lookup branch element - it might need to be escaped 2014-08-17 17:05:32 +02:00
Jeroen van Baarsen 4ac56fa1db Changed some stuff around after rebase 2014-05-23 20:26:31 +02:00
Jeroen van Baarsen d0e794cc1a Make sure the branch counter gets updated
When you delete a branch, the counters wont get updated automaticly,
this happends because of the JS nature of the original call. I've
fixed this by responding with a JS file, and recalculate the counters.

Fixes: #6030
2014-05-23 20:23:59 +02:00
Dmitriy Zaporozhets de7d93e31f Merge branch 'branch-creation-flow' into 'master'
Branch creation flow

To improve user experience with web editing I did next improvements:

* when create branch via ui - redirect to tree view so you start add/edit files
* when click on branch name - redirect to tree view instead of commits so you can immedialty add/edit files
2014-05-23 13:06:32 +00:00
Dmitriy Zaporozhets 695fd3cf2c Move protected branches to Project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-23 14:25:55 +03:00
Dmitriy Zaporozhets b44138ae40 Branch link on branches page goes to tree view instead of commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-23 13:29:14 +03:00
Dmitriy Zaporozhets 0455391add Improve branch-removal logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 14:39:09 +03:00
Dmitriy Zaporozhets 86e25595c8 Fix btn-group align
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 17:44:25 +02:00
Dmitriy Zaporozhets 31386adf53 Fixed 500 error on branch and tag creation via UI
Also fixes issue with branch/tag removing via UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 14:55:27 +02:00