Commit Graph
15261 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 405f91d2b8 Refactor star/fork buttons 2015-03-29 18:15:54 -07:00
Dmitriy Zaporozhets 6b9f1e1a9f Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-file-type 2015-03-29 17:23:53 -07:00
Dmitriy Zaporozhets 38dd6bcaae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-29 17:23:09 -07:00
Dmitriy Zaporozhets 57a49b340e Merge branch 'repo-buttons' into 'master'
Repo buttons

Fixes #796

Moved the star & fork button to inline with the other buttons.

See merge request !473
2015-03-29 17:21:31 +00:00
Phil Hughes 6920fd3ddd Alignment fixes for repo buttons 2015-03-29 12:56:45 +01:00
Phil Hughes 7652510c6b Moved download button into sidebar
Star and fork buttons moved up
2015-03-29 12:23:56 +01:00
Dmitriy Zaporozhets 40c3675372 Merge branch 'clear-note-form-on-succcess' into 'master'
Prevent note form from being cleared when submitting failed.

When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted 😢

See merge request !468
2015-03-29 10:58:34 +00:00
Dmitriy Zaporozhets 5e266f84f5 Merge pull request #9041 from tsigo/rs-maintain-test-schema
Add ActiveRecord::Migration.maintain_test_schema! to spec_helper
2015-03-29 03:42:58 -07:00
Dmitriy Zaporozhets 275f64fb86 Merge pull request #9044 from tsigo/rs-git-template-env
Define GIT_TEMPLATE_DIR environment variable in TestEnv
2015-03-29 03:40:56 -07:00
Dmitriy Zaporozhets 0a634f3481 Merge pull request #9040 from tsigo/rs-refactor-nav-collapse
Refactor sidebar JS logic
2015-03-29 03:36:28 -07:00
Dmitriy Zaporozhets 9742c51438 Merge pull request #9045 from tsigo/rs-move-asana-spec
Move asana_service_spec to its correct location
2015-03-29 03:35:36 -07:00
Dmitriy Zaporozhets 7096ebe8c6 Merge pull request #9048 from NARKOZ/api
properly paginate project events in API
2015-03-29 03:35:16 -07:00
Dmitriy Zaporozhets ccab346a78 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-29 03:32:28 -07:00
Dmitriy Zaporozhets 5f3a758721 Merge branch 'fix-plain-diffs' into 'master'
Remove the email patches link for merge commits

Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches.  This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit.  Together these changes should prevent the 500 errors described in the issue.

cc @sytse

See merge request !1737
2015-03-29 10:32:27 +00:00
Dmitriy Zaporozhets 0154338ed8 Merge branch 'remove_external_trackers_from_yml' into 'master'
We've moved external trackers to service, remove from gitlab.yml.

Fixes #1937

See merge request !1743
2015-03-29 05:31:19 +00:00
Nihad Abbasov bba2b10eb5 properly paginate project events in API 2015-03-29 05:36:53 +05:00
Nihad Abbasov 7277280d5f Merge pull request #9047 from NARKOZ/patch-7
update acts-as-taggable-on
2015-03-29 05:04:45 +05:00
Nihad Abbasov be65373fc7 update acts-as-taggable-on 2015-03-29 03:39:32 +04:00
Sullivan SENECHAL 8ef7220c23 Improve file icons rendering on tree 2015-03-28 16:49:05 +01:00
Vinnie Okada fabaeb096f Upgrade gitlab_git gem to version 7.1.3 2015-03-28 09:10:12 -06:00
Robert Schilling db948ff3d6 Merge pull request #9043 from skburgart/fix/merge-wording
Change merging notification to sound more natural
2015-03-28 09:37:18 +01:00
Robert Speicher 32d6a14098 Move asana_service_spec to its correct location 2015-03-27 22:53:27 -04:00
Robert Speicher 0f1d8e771f Define GIT_TEMPLATE_DIR environment variable in TestEnv
See http://schacon.github.io/git/git-init.html#_template_directory

Without this variable, any global git hooks a developer might have in
~/.git_template would be linked in the `.git/hooks` folder for every
test repository that gets checked out by TestEnv, and would cause
certain specs to fail due to pre-existing hook files.
2015-03-27 22:26:03 -04:00
Dmitriy Zaporozhets 6664da431a Small css improvements to selectboxes and issue filter 2015-03-27 14:28:24 -07:00
Dmitriy Zaporozhets 4d9b4d3582 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-27 13:43:46 -07:00
Dmitriy Zaporozhets 9007af2c7e Merge branch 'issues-filters' into 'master'
Improve UI for issues filters

![filters-ui](https://gitlab.com/gitlab-org/gitlab-ce/uploads/31109bb069a5f42a9b83c2fb44af288b/filters-ui.png)

See merge request !472
2015-03-27 20:38:19 +00:00
Steven Burgart 83064492a0 Change merging notification to sound more natural 2015-03-27 15:50:54 -04:00
Robert Speicher 190e08979c Add ActiveRecord::Migration.maintain_test_schema! to spec_helper
New in Rails 4.1, this eliminates spec failures due to forgetting to run
`db:test:prepare`.
2015-03-27 15:31:16 -04:00
Robert Speicher 65c4dc19f7 Simplify toggle-nav-collapse JS 2015-03-27 15:16:20 -04:00
Dmitriy Zaporozhets 70496fe5d8 Improve UI for issues filters 2015-03-27 12:00:31 -07:00
Dmitriy Zaporozhets 671be8a812 Merge branch 'ctrl-enter-multiple-comments' into 'master'
Prevent holding Control-Enter or Command-Enter from posting comment multiple times.

See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2184

See merge request !467
2015-03-27 16:54:35 +00:00
Marin Jankovski bfc36fff11 We've moved external trackers to service, remove from gitlab.yml. 2015-03-27 09:25:35 -07:00
Douwe Maan 7a70fb123c Prevent holding Control-Enter or Command-Enter from posting comment multiple times. 2015-03-27 16:55:18 +01:00
Douwe Maan 351e61f4b2 Prevent note form from being cleared when submitting failed. 2015-03-27 12:52:07 +01:00
Robert Schilling 7869e258f7 Merge branch 'master' into 'master'
Fix typo 'projecti' to 'project' in ssh doc [ci skip]

There was a typo in the SSH doc: projecti was written instead of project.

See merge request !461
2015-03-27 10:21:52 +00:00
Dmitriy Zaporozhets 28592ae467 Merge branch 'issues-filters' into 'master'
Big refactoring of issues filters

* No magic numbers for issues filtering
* Squash project users selectbox and users selectbox into one class
* Move from API autocomplete to GitLab internal one
* Smarter filter for project/group/all issues
* Use selectbox with searchbox for assignee/author/milestone/label
* Switch to ajax filter for issue author/assignee

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1035

See merge request !466
2015-03-27 08:25:25 +00:00
Dmitriy Zaporozhets c1c93f4f7a Fix tests and unassigned filter for issues. Updated CHANGELOG 2015-03-27 00:27:51 -07:00
Phil Hughes 79bd8ca989 Changed button type 2015-03-27 07:06:38 +00:00
Dmitriy Zaporozhets d6c8eefb5d Big refactoring of issues filters
* Squash project users selectbox and users selectbox into one class
* Move from API autocomplete to GitLab internal one
* Smarter filter for project/group/all issues
* Use selectbox with searchbox for assignee/author/milestone/label
* Switch to ajax filter for issue author/assignee
2015-03-26 19:13:49 -07:00
Dmitriy Zaporozhets 1c2711f7e3 Refactor UsersSelect to use internal gitlab autocomplete controller 2015-03-26 19:13:38 -07:00
Dmitriy Zaporozhets 26053c8705 Add autocomplete controller 2015-03-26 19:06:19 -07:00
Dmitriy Zaporozhets dfb4fcb685 No magic numbers for issues filtering 2015-03-26 18:56:42 -07:00
Marin Jankovski 3d4c2d0b51 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-26 18:07:31 -07:00
Marin Jankovski b322344520 Add a note about not adding new setting options to gitlab.yml. 2015-03-26 18:07:20 -07:00
Sytse (admin) 708c39ff57 Merge branch 'master' into 'master'
Separate Dockerfile for Data and Application

This is based on #1158

Instead of creating data container from same docker image, we create separate docker image for data container to avoid keeping original docker image after upgrading to new version. (That results in 1GB space that cannot be freed)

See merge request !409
2015-03-26 23:47:00 +00:00
Phil Hughes 91b108192c Fork/Star button re-design 2015-03-26 19:38:20 +00:00
Bart Deslagmulder 3cb28de28f Fix typo 'projecti' to 'project' in ssh doc [ci skip] 2015-03-26 20:14:40 +01:00
Dmitriy Zaporozhets 090f2344ec Merge branch 'set-default-url-options' into 'master'
Set Application controller default URL options to ensure all url_for calls are consistent

### What does this MR do?

This MR sets the app controller's `default_url_options` so that all `url_for` calls are consistent.

### Are there points in the code the reviewer needs to double check?

Setting these options may simplify `url_for` calls that load the GitLab options already. I did not want to touch existing code yet. I'm also not sure if there are other options that need to be included.

### Why was this MR needed?

If you run GitLab behind a reverse proxy or in a Docker container, you don't want a user to be seeing the local IP and port on which GitLab is running (e.g. 192.168.1.1:8080). Right now there are places where this internal data is leaked (e.g. see the URL in Profile Settings -> Account -> Username; this uses `user_url`).

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1249

See merge request !453
2015-03-26 18:27:49 +00:00
Dmitriy Zaporozhets a94f8a3c5e Merge branch 'fix-emailsonpush' into 'master'
Fix EmailsOnPush.

See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2185.

See merge request !459
2015-03-26 18:25:19 +00:00
Dmitriy Zaporozhets b8164321fe Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-26 08:56:00 -07:00