Commit Graph

20886 Commits

Author SHA1 Message Date
Douwe Maan 00a4be759e Page titles are title case. 2015-12-02 14:06:25 +01:00
Douwe Maan 1ef01e4f6a Fade in/out Back icon when sidebar is toggled 2015-12-02 14:06:11 +01:00
Douwe Maan 4f7380f94e Fix header tooltip alignment 2015-12-02 14:05:58 +01:00
Douwe Maan 5c771cca33 Fix logo height in signed-out header bar 2015-12-02 14:05:24 +01:00
Douwe Maan 05224ae64a Restore sidebar tooltips and fix logo tooltip location 2015-12-02 14:05:10 +01:00
Dmitriy Zaporozhets 09e712c0fb Merge branch 'rs-icon-link-transparency' into 'master'
Make icon-link image transparent

[ci skip]

See merge request !1945
2015-12-02 09:05:48 +00:00
Dmitriy Zaporozhets 4413e6c4cb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-02 10:05:17 +01:00
Dmitriy Zaporozhets 3f5e999fe7 Merge pull request #9846 from fbeegle/master
Update autocomplete_controller to be more readable
2015-12-02 10:02:15 +01:00
Robert Speicher 9f30f5c635 Make icon-link image transparent 2015-12-01 18:20:01 -05:00
Sytse Sijbrandij ebe0c67ead Merge branch 'up-for-grabs' into 'master'
up for grabs label

cc @dzaporozhets @razer6 

See merge request !1938
2015-12-01 19:04:07 +00:00
Robert Speicher 1ad8b73121 Merge branch 'install-guide-gitlab-shell-version' into 'master'
Install gitlab-shell 2.6.8 in installations from source

[ci skip]

See merge request !1932
2015-12-01 17:55:30 +00:00
Job van der Voort b0ef603f71 up for grabs label 2015-12-01 16:21:53 +01:00
Jacob Vosmaer 55d0e04ffd Auto-detect the required gitlab-shell version 2015-12-01 14:26:57 +01:00
Kamil Trzciński e6149a7ee6 Merge branch 'ci-docs' into 'master'
Update CI quickstart guide

This includes fixes suggested by @axil 

Fixes #3260 

See merge request !1755
2015-12-01 09:09:59 +00:00
Stan Hu 9b10701258 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-01 00:31:42 -08:00
Stan Hu a518879a6f Merge pull request #9868 from yms9654/commit-without-whitespace
Add ignore whitespace change option to commit view
2015-12-01 00:30:39 -08:00
Achilleas Pipinellis 6805f1bc47 Clean up quick start quide [ci skip]
* Remove references to enabling CI since it it will be deprecated
* Revert changes in yaml/README.md, refine it in a separate MR
2015-12-01 10:16:27 +02:00
Achilleas Pipinellis aea5b72faa Remove old images 2015-12-01 09:04:51 +02:00
Achilleas Pipinellis 11b204f131 Final touches for the quick start quide 2015-12-01 09:04:51 +02:00
Achilleas Pipinellis e70fb9cf75 New images for the commit build status 2015-12-01 09:02:40 +02:00
Achilleas Pipinellis 32a3c3e068 Place images in their own dir 2015-12-01 09:00:34 +02:00
Achilleas Pipinellis 3b4806bad9 Add option to enable GitLab CI via .gitlab-ci.yml 2015-12-01 08:58:09 +02:00
Achilleas Pipinellis 1058652a92 Add section of enabling GitLab CI 2015-12-01 08:58:09 +02:00
Achilleas Pipinellis 2c30d11e80 Clean up intro 2015-12-01 08:58:09 +02:00
Job van der Voort 5f6117c0aa update ci docs with yml reason and better quickstart 2015-12-01 08:56:40 +02:00
Minsik Yoon 8c4a3c77d8 Add ignore whitespace change option to commit view 2015-12-01 09:51:10 +09:00
Jacob Vosmaer a9642ba046 Install gitlab-shell 2.6.8 2015-11-30 19:05:28 +01:00
Jacob Vosmaer 7ba00b5082 Use gitlab-shell 2.6.8 in update guide 2015-11-30 19:04:44 +01:00
Valery Sizov 13c6096e42 Merge branch 'upload_hook' into 'master'
Fire update hook from GitLab

https://gitlab.com/gitlab-org/gitlab-ce/issues/3069

See merge request !1882
2015-11-30 17:22:00 +00:00
Robert Speicher ceeb93fa77 Update CHANGELOG
[ci skip]
2015-11-30 12:02:44 -05:00
Robert Speicher 244c9a00e0 Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'
See merge request !1916
2015-11-30 12:00:13 -05:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master'
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
2015-11-30 16:49:09 +00:00
Valery Sizov ae18ba1632 Fire update hook from GitLab 2015-11-30 18:36:34 +02:00
Valery Sizov f1504e1ad5 test fix 2015-11-30 18:03:07 +02:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Douwe Maan a8e05cec00 Merge branch 'rs-build-ssh-path-prefix' into 'master'
Simplify `build_gitlab_shell_ssh_path_prefix`



See merge request !1928
2015-11-30 13:15:21 +00:00
Dmitriy Zaporozhets d73d2a5e58 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-30 10:24:40 +01:00
Dmitriy Zaporozhets f41634c7f6 Merge branch 'gmail_actions_links_on_set_of_emails' into 'master'
Show Gmail actions links only on expected set of emails



See merge request !1901
2015-11-30 09:23:56 +00:00
Dmitriy Zaporozhets 69e9c4143b Merge branch 'expire-application-settings-startup' of https://gitlab.com/stanhu/gitlab-ce 2015-11-30 10:23:25 +01:00
Valery Sizov 461731f076 fix notification_service specs 2015-11-30 11:21:10 +02:00
Dmitriy Zaporozhets c48518ac21 Merge branch 'fix-admin-page-personal-projects' into 'master'
Fix Error 500 when viewing user's personal projects from admin page

This is a regression introduced in 4d7f00f.

Closes #3680

Closes https://github.com/gitlabhq/gitlabhq/issues/9861

Closes gitlab-org/gitlab-ee#90

See merge request !1909
2015-11-30 09:18:59 +00:00
Dmitriy Zaporozhets 0a1b50ef3f Merge branch 'rs-clone-panel' into 'master'
Add clipboard button for project clone panel

Closes #3585 

Project:

![Screen_Shot_2015-11-24_at_7.34.04_PM](/uploads/8bf73a2816f2525896023c36aea402bc/Screen_Shot_2015-11-24_at_7.34.04_PM.png)

Wiki:

![Screen_Shot_2015-11-24_at_7.34.43_PM](/uploads/ddf400a1c979a1d8b535a34877cd6163/Screen_Shot_2015-11-24_at_7.34.43_PM.png)


See merge request !1896
2015-11-30 09:17:39 +00:00
Dmitriy Zaporozhets 2abe9598c1 Merge branch 'rs-update-jquery-turbolinks' into 'master'
Bump jquery-turbolinks to ~> 2.1.0

See #2857

See merge request !1922
2015-11-30 09:15:20 +00:00
Dmitriy Zaporozhets b4d40c16c2 Merge branch 'phantomjs' into 'master'
Use new phantomjs source

Version 1.9 was removed from upstream [Debian repos](http://ftp.de.debian.org/debian/pool/main/p/phantomjs/) so I [used fpm](https://gitlab.com/axil/phantomjs-debian) to build our own Debian packages.

Fixes #3722

See merge request !1924
2015-11-30 09:12:53 +00:00
Robert Speicher e1522ec855 Simplify `build_gitlab_shell_ssh_path_prefix` 2015-11-29 17:52:40 -05:00
Achilleas Pipinellis bb6ce2bb10 Test using a 1.9.8 phantomjs version built with fpm
https://gitlab.com/axil/phantomjs-debian
2015-11-29 13:44:19 +02:00
Achilleas Pipinellis 7d6323a9d4 Update phantomjs to 2.0.0
* Version 1.9 was removed from upstream Debian repos
2015-11-29 11:51:02 +02:00
Achilleas Pipinellis 15291c8974 Merge branch 'remove-satellites-reference' into 'master'
Remove reverence to satellites

Remove reference in backup docs

See merge request !1923
2015-11-28 22:20:26 +00:00
Robert Schilling 85ad2140fa Remove reverence to satellites [ci skip] 2015-11-28 20:53:17 +01:00
Sytse Sijbrandij db1fe56a0e Merge branch 'doc_public_access' into 'master'
Update public access documentation



See merge request !1837
2015-11-28 07:08:17 +00:00