Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 64edb27aa9 Extend Gitlab#default_regex. Dont allow project path ends with .git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 16:13:40 +02:00
Dmitriy Zaporozhets 31239d116a Add additional validation to push event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:21:03 +02:00
Dmitriy Zaporozhets 467e4e81f4 Dont show last push widget if user removed this branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:17:03 +02:00
Dmitriy Zaporozhets 201d489780 Annotate
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:10:03 +02:00
Dmitriy Zaporozhets c727fdd054 Group head titles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 10:35:10 +02:00
Dmitriy Zaporozhets e51411ecc7 Correct head titles for project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 10:28:15 +02:00
Dmitriy Zaporozhets 02448fce1e Improve default theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:20:36 +02:00
Dmitriy Zaporozhets 672cd9b0d9 Improve Charcoal theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:12:22 +02:00
Dmitriy Zaporozhets 929a296920 Improve violet theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:08:03 +02:00
Dmitriy Zaporozhets f597b5f43a Fix logo overflow when broadcast message displayed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:03:11 +02:00
Dmitriy Zaporozhets cb6639ffbb Improve chosen selectbox style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 08:06:58 +02:00
Dmitriy Zaporozhets d89c6adfe6 Improve select UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 22:32:28 +02:00
Dmitriy Zaporozhets bd2ca33d58 Merge branch 'relative' of /home/git/repositories/gitlab/gitlabhq 2013-11-12 18:14:44 +00:00
Dmitriy Zaporozhets 13a6604030 Ability to remvoe broadcast messages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:20:31 +02:00
Dmitriy Zaporozhets c5b667351a Show broadcast message to users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:08:20 +02:00
Dmitriy Zaporozhets 90d599397f Add broadcast messages to admin nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 14:29:43 +02:00
Dmitriy Zaporozhets dd501aa7a7 Broadcast messages scaffold in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 14:28:12 +02:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets 0a08c77519 Improve UX for project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 12:56:20 +02:00
David Pursehouse dfb8d2b7ff Improve status message on merge request page
The status message currently looks like:

  Created on Oct 24, 2013 by John , currently assigned to Bob

There is a space between the author name and the comma, which is
incorrect.  Also, there is no period at the end of the sentence,
which makes it inconsistent with the following line:

  Merged by Bob 5 minutes ago.

Change it to:

  Created on Oct 24, 2013 by John.  Currently assigned to Bob.

Also change the milestone information from:

  and attached to milestone XYZ

to:

  Attached to milestone XYZ.
2013-11-12 18:24:03 +09:00
Dmitriy Zaporozhets 00d6ac299e Fix no-ssh-key-message path for cookie
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:36:09 +02:00
Marin Jankovski e16eb91299 Merge branch 'master' into relative 2013-11-12 09:26:17 +01:00
Dmitriy Zaporozhets b983e9ef0a Add ability to hide no ssh key message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:19:23 +02:00
Dmitriy Zaporozhets 986697a99b Refactor Create/Update file context and lib
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-11 14:58:39 +02:00
Dmitriy Zaporozhets 75303241b1 Merge pull request #5575 from chopmann/patch-1
FIX: note-original-content appending itself too many times
2013-11-11 02:48:42 -08:00
Cornelio Hopmann 92b7c569a7 FIX: note-original-content appending itself too many times 2013-11-10 13:01:29 +00:00
Dmitriy Zaporozhets c9e31875dc Merge pull request #5566 from dpursehouse/improve-email-notification-message
Improve message in email notifications
2013-11-10 00:41:25 -08:00
Dmitriy Zaporozhets ea3680ad80 Merge pull request #5571 from bke-drewb/email
Fix minor errors/annoyances in email templates
2013-11-08 23:59:27 -08:00
Dmitriy Zaporozhets b287462bb4 Merge pull request #4795 from bke-drewb/issue-4769
Issue-4769 - Unable to update case of label
2013-11-08 23:59:04 -08:00
Drew Blessing 57ad81a9c5 Fix minor errors/annoyances in email templates
There was some funny syntax in merge request email templates. There was a ! before
the merge request number when there probably should be a #. This may be some carry over
from markdown but should not be in email templates.  There were also some capitalization
discrepancies among the subject lines. For those OCD people out there I standardized the
capitalization. :)
2013-11-08 10:20:15 -06:00
Marin Jankovski e130e2f6c7 Check on fs. 2013-11-08 17:20:13 +01:00
Marin Jankovski 979ca7d6a2 Correct check. 2013-11-08 16:34:15 +01:00
Dmitriy Zaporozhets 02484930e1 Removed Project#discover_default_branch since it not needed any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-08 09:22:50 +02:00
David Pursehouse 54e65c1176 Improve message in email notifications 2013-11-08 15:48:45 +09:00
Dmitriy Zaporozhets 9d14c5137a Project#default_branch use repo HEAD instead of DB value now
Drop default_branch field from projects table
Use repository.root_ref as value for defautl_branch method
Fixes issue with default_branch and HEAD getting out of sync

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 18:45:39 +02:00
Dmitriy Zaporozhets d618a5fec3 Refactor search views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 09:58:43 +02:00
Dmitriy Zaporozhets 593b05ea94 Look for project description during search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06 09:54:42 +02:00
Dmitriy Zaporozhets 94f8b51cb3 Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq 2013-11-05 15:16:29 +00:00
Dmitriy Zaporozhets b813a4888a Remove User#namespaces method from code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 17:15:43 +02:00
Dmitriy Zaporozhets 6424ec936e Refactor user associations. Drop support of Group#owner_id
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 16:58:13 +02:00
Dmitriy Zaporozhets d78b6ce4cc New feature: Ability to leave project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 16:41:29 +02:00
Dmitriy Zaporozhets 3083e5e4cd Hide new file link if not branch HEAD
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 12:23:11 +02:00
Dmitriy Zaporozhets 160bd862be Refactoring for EditTree and NewTree controllers and contexts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 12:21:11 +02:00
Dmitriy Zaporozhets f61850e6e3 Move part of file creation logic into separate context
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 12:06:52 +02:00
Dmitriy Zaporozhets f2eb668348 Feature test for New file feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 10:45:23 +02:00
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-05 10:28:49 +02:00
Dmitriy Zaporozhets f41731047f Merge pull request #5507 from jojosch/project-issue-tracker-selection
Preselect the current issue tracker with selected="selected"
2013-11-04 10:32:19 -08:00
Dmitriy Zaporozhets d6fce1055a Merge pull request #5521 from mynetx/ie10-css-gradients
Support -ms-linear-gradient style for IE10+
2013-11-04 10:31:20 -08:00
Dmitriy Zaporozhets e1607ec455 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-04 19:00:11 +02:00
Dmitriy Zaporozhets 6d86b698e3 Always show namespace for project title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-04 15:18:55 +02:00