Commit Graph
1229 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2388fdd7c6 Improve fork to namespaces feature
* Show namespace thumbnail differently if project was already forked
* Show loading spinner when click on fork
* Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-14 16:06:39 +02:00
Dmitriy Zaporozhets e08e405ac4 Select namespace where to fork project
Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-13 22:06:19 +02:00
Dmitriy Zaporozhets c58edd7c70 Merge branch 'add_issue_edited_timestamp' into 'master'
Add issue edited timestamp

Comments already have this feature.
So, I think, issues should also have it.
![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png)

See merge request !235
2014-11-12 11:02:25 +00:00
Dmitriy Zaporozhets a6f48aedc3 Merge pull request #7944 from cirosantilli/new-blob-commit-below
Move new blob commit message textarea below editor
2014-11-11 17:22:51 +02:00
Dmitriy Zaporozhets 72922cfa27 Merge branch 'remove_unused_javascript' into 'master'
Remove unused javascript

projects:teams:members:index doesn't exists

See merge request !234
2014-11-10 19:45:15 +00:00
Dmitriy Zaporozhets 5ef196621e Merge branch 'better-mr-instructions' into 'master'
Better merge request manual instructions

I noticed the current instructions for manually merging a merge request that was submitted from a fork could create unnecessary merge requests or strange history. Imagine this:

1. Alice creates a repository and commits / pushes a single commit with SHA1 `A` to `master`.
2. Bob forks this repository and creates a new branch `myfeature` on `master` (`A`)
3. Alice commits `B` to `master` (which has the parent `A`)
4. Bob creates two commits on `myfeature` `P` and `Q`.
5. Bob submits the merge request to merge his `myfeature` into Alice's `master` branch.
6. Alice follows the manual merge request instructions:
  1. `git checkout -b bob/repo-myfeature master`
  2. `git pull http://... myfeature`

The branch `bob/repo-myfeature` was created from Alice's current `master`, which was `B`. When the `pull` is executed, git will fetch Bob's branch and then merged the fetched branch `Q` into the current branch's location `B`. This creates an unnecessary merge commit from `master` into the branch Alice is trying to merge. No harm is done, but the history is a bit messier.

This is even worse if Alice has set `git pull` to rebase by default. In this case, the commit `B` is rebased on top of `Q`. When Alice checks out `master` and merges in the branch, there will actually be a duplicate `B` commit.

These new instructions instead tell the user to fetch Bob's `myfeature` branch. This will fetch the necessary commits `P` and `Q` and create a temporary ref `FETCH_HEAD` pointing to `Q`. Alice will then create her local `bob/repo-myfeature` branch starting at `FETCH_HEAD`. No unnecessary merge commits, and no accidental rebasing.

See merge request !16
2014-11-10 19:39:25 +00:00
Nikita Verkhovin 2148e1997a Add issue edited timestamp 2014-11-08 16:54:08 +06:00
Dmitriy Zaporozhets 6cac4e6271 Fix attachment misaligned in comment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-07 12:51:18 +02:00
skv 9353db59a0 remove unused js 2014-11-06 22:34:41 +03:00
Valeriy Sizov f84772875e Merge pull request #7863 from cirosantilli/rm-blob-link-to-button
Transform remove blob link into button.
2014-11-05 14:09:32 +02:00
Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-10-30 16:17:36 +02:00
Sean Edge 822d9aa6ba Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags. 2014-10-30 09:48:23 -04:00
Dmitriy Zaporozhets ff6b352610 Merge branch 'project_name_and_path_rename' into 'master'
Project name and path rename in the same section

Fixes #1577

See merge request !1223
2014-10-30 11:19:33 +00:00
Dmitriy Zaporozhets 905004fdc3 Merge pull request #7980 from mr-vinn/diff-renames
Display renamed files in diff views
2014-10-29 19:09:33 +02:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05: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
Marin Jankovski 50ee0b81b8 Leave the project name field editable, fix the test. 2014-10-28 09:19:58 +01:00
Dmitriy Zaporozhets 367d4db4cd Merge pull request #8155 from cirosantilli/unassigned
Show nothing instead of unassigned on issues
2014-10-27 19:21:26 +02:00
Marin Jankovski d08bb4b3a4 Add project name to rename repository section 2014-10-27 16:08:11 +01:00
Ciro Santilli e4912243c1 Transform remove blob link into button. 2014-10-24 23:44:30 +02:00
Ciro Santilli 2c14f9c41f Show nothing instead of unassigned on issues 2014-10-23 16:25:09 +02:00
Dmitriy Zaporozhets 18ba6987cd Merge branch 'fix_milestone_link' into 'master'
Fix milestone link in issue page. Closes #174

For a complete description see #174.

See merge request !196
2014-10-22 14:15:33 +00:00
Dmitriy Zaporozhets c926922ade Show merge in progress message if MR is locked
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-15 15:52:39 +03:00
Dmitriy Zaporozhets 381a6283a9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-15 15:35:08 +03:00
Dmitriy Zaporozhets 67a28cea30 Merge pull request #8048 from skv-headless/master
same rendering for note diff as for usual diff
2014-10-15 15:15:40 +03:00
Marin Jankovski 76cde5c0e5 Add links to the migration doc, make it clear import is only for git repos. 2014-10-15 13:13:42 +02:00
Evgeniy Sokovikov 732e6c3dbb same rendering for note diff as for usual diff 2014-10-15 13:03:27 +04:00
Dmitriy Zaporozhets 0d30b13a7a Move "modify merge message link" to the right to prevent accidently hiting accept button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-14 17:48:32 +03:00
Ciro Santilli d584c406e8 Move new blob commit message textarea below editor
- match edit blob view
- you enter the commit message *after* you make the modifications
2014-10-13 20:54:33 +02:00
Dmitriy Zaporozhets e261de255d Merge pull request #7942 from cirosantilli/commit-changes-uppercase
Make new and edit file submit more uniform
2014-10-13 18:47:46 +03:00
Dmitriy Zaporozhets b956605f9e Merge branch 'ambiguous-sha' into 'master'
Fix ambiguous sha problem with mentioned commit

Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception.

- [x] write full commit sha in db.
- [x] Standardise usage of sha truncation: 8 characters everywhere.
- [x] prevent exception when ambiguous sha requested in markdown

Fixes #1644

See merge request !1171
2014-10-12 20:28:21 +00:00
Sytse Sijbrandij c9c6f77ec1 Merge pull request #7915 from bbodenmiller/patch-12
improve wording on protected branches page
2014-10-12 14:54:36 +02:00
Ben Bodenmiller ab64ca7a11 improve wording on protected branches page 2014-10-12 05:23:12 -07:00
Dmitriy Zaporozhets ea04ed7879 Use 8chars short sha for commit in views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 16:30:14 +03:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
Dmitriy Zaporozhets a1e2fb8458 Merge pull request #7986 from liammonahan/master
Correctly pluralize participants on issue show page
2014-10-08 20:15:02 +03:00
Dmitriy Zaporozhets 21e9ed2eaf Merge branch 'improve-danger-zone' into 'master'
Improve danger zone

* show transfer/remove boxes by default
* ask person to type project name before transfer/remove

Fixes #1347

See merge request !1161
2014-10-08 13:58:31 +00:00
Liam Monahan 48bc9e3623 Correctly pluralize participants on issue show page. 2014-10-08 09:00:47 -04:00
Dmitriy Zaporozhets ab68fd2206 Restyle colorful panel boxes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-08 15:47:24 +03:00
Dmitriy Zaporozhets 74217f753f Apply ConfirmDangerModal for project transfer/remove actions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-08 13:57:54 +03:00
Keith Pitt f013973d19 Handle the case where the CI service may not provide a status_img_path method. 2014-10-08 17:22:41 +08:00
Dmitriy Zaporozhets e8a826030e show danger settings by default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-08 11:54:51 +03:00
Keith Pitt 4c7da578f2 Merge branch 'master' into buildbox-service
Conflicts:
	app/models/project.rb
2014-10-08 16:33:53 +08:00
Keith Pitt 76594d474c Added support for Buildbox 2014-10-08 16:30:04 +08:00
Ciro Santilli 166c215a75 Make new and edit file submit more uniform 2014-10-08 10:01:07 +02:00
Dmitriy Zaporozhets 593a1b3b3e Style merge request CI widget to match MR/Issue box
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-07 15:11:18 +03:00
Vinnie Okada 0084b8a776 Display renamed files in diff views
Show both the old and new filenames when viewing the diff for a renamed
file.
2014-10-06 21:42:07 -05:00
Marin Jankovski 0fed1b5876 Merge pull request #7964 from mr-vinn/task-lists
Add task lists to issues and merge requests
2014-10-06 17:29:06 +02:00
Dmitriy Zaporozhets 299114948b Use only escaped auto_link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-06 15:15:39 +03:00
Vinnie Okada 9f0083a96c Add task lists to issues and merge requests
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input.  Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks.  Task status is also displayed in the MR and issue
lists.
2014-10-05 22:15:27 -05:00