Commit Graph
4837 Commits
Author SHA1 Message Date
Ciro Santilli 0cdef83dc8 Remove type submit from button_tag since default. 2014-09-26 16:52:36 +02:00
Robert Schilling 53f6f537b0 Fix spelling error on profile page 2014-09-26 01:48:17 +02:00
Dmitriy Zaporozhets ae94f59bd5 Merge pull request #7803 from cirosantilli/rm-unused-mr-contributing
Remove ununsed CONTRIBUTING link on edit MR form.
2014-09-25 18:45:02 +03:00
Dmitriy Zaporozhets 20d6f96928 Improve flash messages
* dont fadeout so user can read
* show inside content block so user can notice it

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 18:00:21 +03:00
Dmitriy Zaporozhets 3a72af480d Merge branch 'use-more-rugged' into 'master'
Make GitLab CE works with new gitlab_git

Recently we removed grit dependency from `gitlab_git` in favor of rugged.

This changes make GitLab works with new library.

See merge request !194
2014-09-25 13:58:20 +00:00
Dmitriy Zaporozhets 4b65b0e0f5 Fix wiki
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 13:56:23 +03:00
Dmitriy Zaporozhets 64a2afd3a4 Fix creating new file via web editor
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-24 19:30:58 +03:00
Dmitriy Zaporozhets 0b7377d86e Merge pull request #7820 from skv-headless/move_blame_to_rugged
blame with rugged
2014-09-24 12:55:40 +03:00
Dmitriy Zaporozhets 79a4da907d Merge pull request #7816 from cirosantilli/factor-fork
Factor fork button view.
2014-09-24 12:41:16 +03:00
Dmitriy Zaporozhets f0c0edc2a6 Merge branch 'improve-protect-wording' into 'master'
Improve protect wording

See merge request !1103
2014-09-24 09:39:09 +00:00
skv a286f92050 blame with rugged 2014-09-24 11:35:13 +04:00
Ciro Santilli b5c0bdd7c9 Factor fork button view. 2014-09-23 21:16:27 +02:00
Dmitriy Zaporozhets b897cc63a5 Fix 500 error on diff if file permission changed 2014-09-23 16:14:17 +03:00
Ciro Santilli 83e8f923a3 Remove ununsed CONTRIBUTING link on edit MR form.
The code is never reached because the new and edit MR forms have diverged,
and the CONTRIBUTING link is not shown when editing MRs.
2014-09-22 21:34:16 +02:00
Ciro Santilli 705fe01dca Factor issue and edit MR form label field and submit. 2014-09-22 21:24:25 +02:00
Dmitriy Zaporozhets e54fdee436 Merge pull request #7657 from cirosantilli/factor-commit-list
[refactor] Factor out commit list from compare and new MR.
2014-09-22 21:03:29 +03:00
Dmitriy Zaporozhets f96b954b1c Merge pull request #7804 from cirosantilli/factor-issue-mr-form-error
Factor issue and MR edit form error list.
2014-09-22 21:01:03 +03:00
Dmitriy Zaporozhets ed9a6bf99c Merge pull request #7758 from bbodenmiller/patch-1
cleanup empty repo page
2014-09-22 20:57:27 +03:00
Dmitriy Zaporozhets 8cd882355e Merge branch '7-4-pre' into 'master'
7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096
2014-09-22 17:25:49 +00:00
Sytse Sijbrandij 4160180621 Improve the wording explaining protected branches. 2014-09-22 12:25:07 +02:00
Ciro Santilli eb033aa60e Factor issue and MR edit form error list. 2014-09-20 18:02:01 +02:00
Robert Schilling 8fd0d74bd8 Merge pull request #7801 from cirosantilli/dry-zen-view
Factor zen mode.
2014-09-20 17:09:20 +02:00
Ciro Santilli adaec60a50 Factor zen mode. 2014-09-20 15:32:46 +02:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-20 11:55:58 +03:00
Ben Bodenmiller 9a1fe30682 link to page that discusses how to generate ssh key 2014-09-19 02:17:22 -07:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Dmitriy Zaporozhets 6dff16a679 Merge branch 'readme-anchor' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:22 +03:00
Ben Bodenmiller dcc51b0d2c cleanup empty repo page
Improve wording on empty repo page and make header capitalization consistent
2014-09-16 21:48:08 -07:00
Dmitriy Zaporozhets 39ab7527d4 Fix project member management
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 11:04:25 +03:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets 09b23228df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-15 10:20:43 +03:00
Dmitriy Zaporozhets 1aa48174db Fix STI+polymorphic for Group <-> GroupMember
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Tamer Sherif a391cd21d7 Fix grammatical error in 'not merged changes' msg 2014-09-14 12:31:32 +03:00
Ciro Santilli 1da0c0b6e4 Factor out commit list from compare and new MR. 2014-09-14 10:15:14 +02:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
uran 7d9cdc2d37 Source repo is now clickable. 2014-09-12 17:53:08 +03:00
Dmitriy Zaporozhets cbb44b9da3 Merge pull request #7662 from Razer6/disable_buttons_on_empty_form
[UX] Disable buttons if form is empty
2014-09-12 13:41:48 +03:00
Dmitriy Zaporozhets 318d5d93e3 Merge pull request #7522 from Razer6/fix_tags_count
[UX] Update tag count if tag gets deleted via web interface
2014-09-12 13:39:56 +03:00
Sytse Sijbrandij 21134df202 Merge pull request #7713 from bbodenmiller/patch-5
Add Feedback link
2014-09-12 11:32:41 +02:00
Ben Bodenmiller 47171aab3d add requests link
Add requests link for feature requests.
2014-09-12 02:07:17 -07:00
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Robert Schilling 233d89a9e7 Disable buttons if required forms are empty 2014-09-11 19:48:02 +02:00
Robert Schilling 0d5958c729 Close Zen mode by ESC, foward/backward 2014-09-11 19:24:51 +02:00
Robert Schilling 58c0a4f5cf Implement zen mode for issues/MRs/notes
Close Zen mode by ESC, foward/backward
2014-09-11 19:24:51 +02:00
Dmitriy Zaporozhets 350f557479 Make labels clickable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-11 14:18:00 +03:00
Dmitriy Zaporozhets 59187157b1 Merge pull request #7730 from bbodenmiller/patch-12
url -> URL
2014-09-11 09:24:11 +03:00