home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,175 Commits 48 Branches 340 Tags
f0b8477cdacb80fcabf7e50f520f6d280feccced
Commit Graph
13175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets c8bb171664 Merge branch 'fix-ui-milestone' into 'master' 
Improve UI for milestone pages

See merge request !1356
 2014-12-27 17:25:42 +00:00
Dmitriy Zaporozhets b8bffc0da2 Dont check for milestone description on group milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-27 17:48:10 +02:00
Dmitriy Zaporozhets 4adc033761 Improve UI for group milestone and project milestone pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-27 16:03:02 +02:00
Dmitriy Zaporozhets 80597d59e0 Merge branch 'dashboard-fix-assignee' into 'master' 
Dashboard: fix assignee filter and remove some old code

See merge request !1354
 2014-12-27 07:52:59 +00:00
Dmitriy Zaporozhets 465f186954 Show assigned issues/mr be default on dashboard 
This was default before but now it fixed with providing assignee_id
parameter making url shareble and dont reset when other filters users.

Also this commit removes old methods that are not used any more.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 18:33:53 +02:00
Stephan van Leeuwen 071ad02c02 Updated mobile sidebar to allow scrolling 2014-12-26 15:29:19 +01:00
Stephan van Leeuwen 1b6ebd1717 Updated sidebar style to span the whole height. 2014-12-26 15:29:02 +01:00
Dmitriy Zaporozhets a7b7a2dd4c Merge branch 'ui-changes' into 'master' 
UI changes

Set of UI fixes for side nav

See merge request !1352
 2014-12-26 13:33:58 +00:00
Dmitriy Zaporozhets aa54482a37 Fix no-ssh message for non logged in user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:53:50 +02:00
Dmitriy Zaporozhets 573d554c69 set z-index for navbar and sidebar explicitly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:34:50 +02:00
Dmitriy Zaporozhets a248efadf7 Fix links for no-ssh message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:28:49 +02:00
Dmitriy Zaporozhets f1c39763c9 Fix UI for no-ssh-key message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:25:37 +02:00
Dmitriy Zaporozhets 038161f4e0 Make nprogress color to red 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:19:54 +02:00
Dmitriy Zaporozhets e3951019f5 Put nprogress spinner to bottom left position 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:19:30 +02:00
Dmitriy Zaporozhets b01c5d993c New CHANGELOG items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 21:31:04 +02:00
Dmitriy Zaporozhets ed932d82db Merge branch 'oauth2_provider' into 'master' 
Oauth2 provider

Please update #1713

See merge request !1346
 2014-12-25 19:27:07 +00:00
Dmitriy Zaporozhets d2bd5e833f Fix nav_link support for several path options 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 20:51:07 +02:00
Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
 2014-12-25 18:48:15 +02:00
Dmitriy Zaporozhets aadfb3665f Fix tests and add message if no oauth apps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:46:19 +02:00
Dmitriy Zaporozhets 592e396869 Rework oauth2 feature 
* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:35:04 +02:00
Dmitriy Zaporozhets 7fe8d41d88 Improve code style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 16:46:28 +02:00
Dmitriy Zaporozhets 6428698580 Merge branch 'ui-improvements' into 'master' 
UI improvements

Set of UI changes mostly for issue and merge request

* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block

See merge request !1351
 2014-12-25 14:36:34 +00:00
Dmitriy Zaporozhets 40ff1bc8ba Align sidebar navigation differently 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:23 +02:00
Dmitriy Zaporozhets fca161f5c5 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:12 +02:00
Dmitriy Zaporozhets 99e52c9ad0 Small UI imporovement for merge request accept widget and projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:58:43 +02:00
Dmitriy Zaporozhets 7c5bf9372c Merge branch 'master' into ui-improvements 2014-12-25 14:46:58 +02:00
Dmitriy Zaporozhets 88b480174c Improve issue/mr page for tablets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:46:18 +02:00
Dmitriy Zaporozhets 5140a4cd13 Set of UI changes mostly for issue and merge request 
* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:32:49 +02:00
Dmitriy Zaporozhets e46f546b4c Merge branch 'fold-sidenav' into 'master' 
Fold sidenav for mobile devices

Fold sidebar for xs and sm displays.

See merge request !1350
 2014-12-25 09:01:37 +00:00
Dmitriy Zaporozhets f0d0b19393 Fold sidebar for mobile devices and expand for desktop 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 10:13:45 +02:00
Dmitriy Zaporozhets b4e6dec890 fold-subnav class for folded sidebar navigation. Dashboard and project nav adopted 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 18:34:14 +02:00
Francesco Coda Zabetta 84b40a346a check browser version, blacklisting outdated IE (version < 10) 2014-12-24 16:22:08 +01:00
Dmitriy Zaporozhets fe104386b1 Fix layout if broadcast message enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 16:15:45 +02:00