home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,221 Commits 48 Branches 340 Tags
3a3b0da81e2320be890ddb9c00a055ea4c6a305b
Commit Graph
13221 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ciro Santilli 3a3b0da81e Make blob new and edit file editors more uniform 2014-12-30 17:44:31 +01:00
Dmitriy Zaporozhets 394e2ec50b Merge branch 'ajax-group-select' into 'master' 
Ajax group select

Helper method for creatins select2 selectbox with ajax query to groups via API

See merge request !1363
 2014-12-30 10:31:59 +00:00
Dmitriy Zaporozhets 5d2e637c17 Group selectbox js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:48 +02:00
Dmitriy Zaporozhets 27ee0fc57b Helper for ajax group selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Dmitriy Zaporozhets 2660e83c97 Add group filtering by name for API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Dmitriy Zaporozhets da9d827904 Merge branch 'inline-protected-branches' into 'master' 
Improve UI for protected branches

See merge request !1361
 2014-12-29 21:08:21 +00:00
Dmitriy Zaporozhets 95cd5b275a Prevent content overflow for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 22:59:08 +02:00
Dmitriy Zaporozhets a9cf84e5ac Merge pull request #7675 from yglukhov/patch_notes_api 
Implemented notes (body) patching in API.
 2014-12-29 21:06:49 +02:00
Dmitriy Zaporozhets 159ba9b958 Merge pull request #8496 from NARKOZ/644 
chmod -x
 2014-12-29 21:04:58 +02:00
Dmitriy Zaporozhets 95c0393789 Inline protected branches list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:30:27 +02:00
Dmitriy Zaporozhets a0c4fa3174 Use same font size for all sidenav items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:11:34 +02:00
Dmitriy Zaporozhets 37ed5837a8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-12-29 18:32:19 +02:00
Dmitriy Zaporozhets e0459da2a6 Merge branch 'fix-services' into 'master' 
Fix async services execution broken in 7.6

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

See merge request !1360
 2014-12-29 16:31:49 +00:00
Dmitriy Zaporozhets 71ae8570fc Merge branch 'project-ordering' into 'master' 
API: Project ordering

Added support for ordering and sorting projects by id, name, created_at or last_activity_at fields.

When the order_by parameter is passed the projects will be ordered by the appropriate field, when the parameter is not passed the original ordering will apply.

the sort parameter will default to ASC, and will only be DESC if the sort parameter is desc

See merge request !266
 2014-12-29 16:10:17 +00:00
Dmitriy Zaporozhets c662b2e199 Merge branch 'developer_can_push_to_protected_branches_option' into 'master' 
Developer can push to protected branches option

Adds option to enable option to enable push to protected branches for developers, per protected branch. Off by default, developers cannot push to protected branches.

If turned on, developers can push to protected branches but still cannot force push or remove the branch.

Allows more control over protected branches.

See merge request !1353
 2014-12-29 16:04:40 +00:00
Dmitriy Zaporozhets 2ed9a42edc Fix sidekiq for development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 17:56:29 +02:00
Dmitriy Zaporozhets ed4e682eb8 Fix async services execution broken in 7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 17:48:43 +02:00
Stephan van Leeuwen 23e83a6a99 Added changelog item 2014-12-29 16:41:50 +01:00
Stephan van Leeuwen 180fda3d0a Updated indentation on case when statements. 2014-12-29 16:36:56 +01:00
Stephan van Leeuwen 6af34b0f71 Changed setting the sort variable 
Changed from using cases to set the sort variable, to use a one line if/else statement
 2014-12-29 16:36:56 +01:00
Stephan van Leeuwen 6b50721946 Updated projects api to allow ordering 
Added support for order_by and sort parameters, to sort the projects by the specified values.
Updated projects api documentation including the order_by and sort parameters
 2014-12-29 16:36:56 +01:00
Dmitriy Zaporozhets b07802ab68 Rescue Net::OpenTimeout exception in web hook 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 16:41:10 +02:00
Marin Jankovski e005d4191a Merge branch 'master' into developer_can_push_to_protected_branches_option 2014-12-29 15:39:03 +01:00
Dmitriy Zaporozhets 75043a9eba Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-29 16:35:28 +02:00
Dmitriy Zaporozhets 2c7cdd5254 Merge branch 'mention-notification-level' into 'master' 
Mention notification level

It does disable all emails expect system one or when you was @mentioned.

Fixes #1724

See merge request !1359
 2014-12-29 14:34:50 +00:00
Dmitriy Zaporozhets 0d8118c68f Add mention notification level to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 15:57:07 +02:00
Dmitriy Zaporozhets cf95736865 New feature: add 'Mention' notification level 
It does disable all emails expect system one or when you was @mentioned

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 15:55:21 +02:00
Robert Schilling 7b456d133e Merge pull request #8504 from cirosantilli/permissions-style 
permission.md align table, rm double empty line
 2014-12-29 13:58:33 +01:00
Ciro Santilli 675704f4bb permission.md align table, rm double empty line 2014-12-29 13:05:55 +01:00
Dmitriy Zaporozhets 6aec286fca Fix navbar items for mobile biew 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 13:58:01 +02:00
Dmitriy Zaporozhets f0b8477cda Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-29 13:47:20 +02:00
Dmitriy Zaporozhets 7c737aa697 Merge branch 'vicvega-check_browser_version' into 'master' 
Check browser version

Fix conflicts and merge https://github.com/gitlabhq/gitlabhq/pull/8385

See merge request !1357
 2014-12-29 11:44:32 +00:00
Dmitriy Zaporozhets 86a7787a15 Merge pull request #8324 from cirosantilli/rm-commit 
Remove commit indicator from path on Commits tab [UI]
 2014-12-29 13:41:32 +02:00
Dmitriy Zaporozhets 5bcf82634a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-29 13:32:11 +02:00
Dmitriy Zaporozhets 3d2f123081 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 13:31:30 +02:00
Marin Jankovski 43c2d5a268 Add documentation about protected branches. 2014-12-29 10:44:08 +01:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Marin Jankovski 1c089a8561 Use shorter search for protected branch status. 2014-12-29 09:04:31 +01:00
Robert Schilling eae5f544cd Let's start 7.7.0.pre 2014-12-28 22:52:17 +01:00
Dmitriy Zaporozhets 6cf501004b Merge pull request #8442 from Hexide/dev-email-template-dates 
Add commit dates to repository-push email tempalte
 2014-12-28 22:16:32 +02:00
Dmitriy Zaporozhets 803ca9e8cc Merge pull request #7957 from cirosantilli/rm-unused-project-code 
Remove unused Project#code function [failure unrelated]
 2014-12-28 22:15:43 +02:00
Dmitriy Zaporozhets 3a678f758d Merge pull request #7989 from cirosantilli/match-compare-to-get 
Disallow POST to compare as it does not create objects
 2014-12-28 22:15:09 +02:00
Dmitriy Zaporozhets 3d3c7e743f Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
 2014-12-28 22:13:31 +02:00
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity 
Teamcity integration using 8.1 rest api
 2014-12-28 22:11:29 +02:00
Dmitriy Zaporozhets 19c6951cc2 Merge pull request #8435 from chulkilee/ruby-2.1.5 
ruby 2.1.5 in .ruby-version
 2014-12-28 22:10:43 +02:00
Dmitriy Zaporozhets 38c0c50260 Merge pull request #7782 from cirosantilli/sort-gitignore 
Sort .gitignore.
 2014-12-28 22:09:36 +02:00
Dmitriy Zaporozhets 3e0f512bc2 Merge pull request #8497 from cirosantilli/h1-workflow-readme 
doc workflow markdown style
 2014-12-28 22:07:19 +02:00
Dmitriy Zaporozhets afccd3245a Merge branch 'ui-fixes' into 'master' 
Ui fixes

Fixes the ui bugs described in #925.

Also added the suggestion to keep the header at the top of the page.

Fixes #925

Some before/after screenshots:

- Border doesn't reach bottom on smaller pages
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5096094d94/Screenshot_from_2014-12-27_19_49_24.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/551c1924e4/Screenshot_from_2014-12-27_19_51_43.png)

- Ability to always scroll 48px (visible by the scrollbar)
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ea591bf7b3/Screenshot_from_2014-12-27_19_53_41.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/97df62b40d/Screenshot_from_2014-12-27_19_53_17.png)

- Mobile sidebar icons off screen (Visible by the scrollbar on the after picture)
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/b6d9a4d076/Screenshot_from_2014-12-27_19_49_05.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/fc52ac31ba/Screenshot_from_2014-12-27_19_48_16.png)

- Header fixed at top
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5d74dc1ea5/Screenshot_from_2014-12-27_19_59_28.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/57c4c3ea7d/Screenshot_from_2014-12-27_20_00_05.png)

See merge request !269
 2014-12-28 19:48:29 +00:00
Ciro Santilli 05a6115bc8 doc workflow markdown style 
- add h1 to README
- move h1 in workflow.md to h2 since the top image acts as h1
- typos
 2014-12-27 21:43:43 +01:00
Stephan van Leeuwen 6342bc2994 Changed header to stay at the top of the page. 2014-12-27 20:08:29 +01:00