summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-3137-129/+311
| |\ \ \ \
| * | | | | Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-3110-95/+299
| | | | | |
* | | | | | Merge branch 'profile-settings' into 'master' Dmitriy Zaporozhets2015-09-013-25/+25
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename profile settings navigation to "Profile Settings" Fixes #2555 See merge request !1926
| * | | | | Update db schemaDmitriy Zaporozhets2015-09-011-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Rename profile settings navigation to "Profile Settings"Dmitriy Zaporozhets2015-09-012-3/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-09-011-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'master'Valery Sizov2015-09-011-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Racc to 1.4.12 The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option. See merge request !1201
| | * | | | | Update Racc to 1.4.12Yorick Peterse2015-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures GitLab can actually run Rubinius, previously it would segfault in Racc during the bootup phase.
* | | | | | | Merge branch 'add-commands' into 'master' Job van der Voort2015-09-011-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new commands to GitLab Basics docs See merge request !1924
| * | | | | | deleted additional infokaren Carias2015-08-311-3/+0
| | | | | | |
| * | | | | | added new commandskaren Carias2015-08-251-2/+0
| | | | | | |
| * | | | | | added new commandskaren Carias2015-08-252-0/+10
| | | | | | |
* | | | | | | Merge branch 'fix-branches-cache-after-merge' into 'master'Valery Sizov2015-09-013-1/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire cache when merge request source branch was removed Re-implement !1160 for 8.0. Also we have tests for MergeWorker now! Yay :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1224
| * | | | | | | Expire cache when merge request source branch was removedfix-branches-cache-after-mergeDmitriy Zaporozhets2015-08-283-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'oauth_token_with_ldap' into 'master'Dmitriy Zaporozhets2015-09-012-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieving oauth token with LDAP credentials https://dev.gitlab.org/gitlab/gitlabhq/issues/2529 See merge request !1220
| * | | | | | | retrieving oauth token with LDAP credentialsoauth_token_with_ldapValery Sizov2015-08-312-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'fix-headers-blocking-anchors' into 'master'Dmitriy Zaporozhets2015-08-312-5/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent anchors from being hidden by header upon a new page load Browsers change the scroll position after the page is loaded, and the current 1 ms delay wasn't long enough for the browser to jump to the anchor. Even then, it appears another 100ms delay is necessary to adjust the scroll properly: http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict Add a little more of an offset to see a few lines before the anchor. * Closes #1614 * Closes #1024 See merge request !1225
| * | | | | | Prevent anchors from being hidden by header upon a new page load.Stan Hu2015-08-292-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browsers change the scroll position after the page is loaded, and the current 1 ms delay wasn't long enough for the browser to jump to the anchor. Even then, it appears another 100ms delay is necessary to adjust the scroll properly: http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict Add a little more of an offset to see a few lines before the anchor. Closes #1614 Closes #1024
* | | | | | | Ordering of GitHub issues import is now fixedAchilleas Pipinellis2015-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/commit/4a203aab57c69ea402939cf8fc423a0e5aaa1cab
* | | | | | | Merge branch 'dont-notify-users-without-project-access' into 'master'Robert Speicher2015-08-303-5/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify users without access to the project when they are (accidentally) mentioned in a note. Addresses #2366. See merge request !1216
| * | | | | | | Don't notify users without access to the project when they are ↵dont-notify-users-without-project-accessDouwe Maan2015-08-263-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (accidentally) mentioned in a note.
* | | | | | | | Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993'Douwe Maan2015-08-295-4/+46
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Move changelog itemjoelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-291-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-29227-915/+4962
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'fix-session_expire_delay' into 'master'Stan Hu2015-08-281-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read session_expire_delay from database if table & column exists; Previous code only ends up using the default value for session_expire_delay, not the value stored in the database, making the session always 1 week. See merge request !1217
| * | | | | | | | fixed connection detection so settings can be read from the databaseEric Maziade2015-08-271-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'make_all_profile_public' into 'master'Dmitriy Zaporozhets2015-08-275-18/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all profile public https://dev.gitlab.org/gitlab/gitlabhq/issues/1361 See merge request !1219
| * | | | | | | | | Make all profile publicmake_all_profile_publicValery Sizov2015-08-275-18/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'upgrade-gitlab-git-7.2.15' into 'master'Douwe Maan2015-08-273-3/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files Closes https://github.com/gitlabhq/gitlabhq/issues/9577 See merge request !1222
| * | | | | | | | Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded filesStan Hu2015-08-273-3/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9577
* | | | | | | | Merge branch 'improve-mail_room-wrapper' into 'master'Douwe Maan2015-08-272-3/+34
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly daemonize the mail_room process The old invocation only worked by accident because we have a '&' somewhere in the init script for expediency. When ran from a terminal, the mail_room daemon process ended up in the session of the terminal. This commit adds a small wrapper that tries to do the textbook daemonization steps (double fork, setsid etc.) while also taking care that the pidfile is written before the 'start' process exits. See merge request !1221
| * | | | | | | Properly daemonize the mail_room processimprove-mail_room-wrapperJacob Vosmaer2015-08-272-3/+34
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old invocation only worked by accident because we have a '&' somewhere in the init script for expediency. When ran from a terminal, the mail_room daemon process ended up in the session of the terminal. This commit adds a small wrapper that tries to do the textbook daemonization steps (double fork, setsid etc.) while also taking care that the pidfile is written before the 'start' process exits.
* | | | | | | Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-2723-97/+240
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
| * | | | | | Make snippet_blob highlight server-side as wellrs-remove-user-color-scheme-classRobert Speicher2015-08-261-1/+1
| | | | | | |
| * | | | | | Add user_color_scheme class to file_highlightRobert Speicher2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents an unstyled flash that occurs when we were only applying the syntax highlighting class in Javascript. Now for these uncached blobs the server can add the syntax class, and for (possibly) cached fenced code blocks, the Javascript will add it as needed.
| * | | | | | Re-add user_color_scheme helperRobert Speicher2015-08-262-24/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update PreferencesHelper specs
| * | | | | | Add `count` to Themes and ColorSchemesRobert Speicher2015-08-262-0/+10
| | | | | | |
| * | | | | | Add `Gitlab::Themes.for_user`Robert Speicher2015-08-261-0/+13
| | | | | | |
| * | | | | | Fix two more failing specsRobert Speicher2015-08-251-3/+2
| | | | | | |
| * | | | | | Fix failing specRobert Speicher2015-08-251-2/+2
| | | | | | |
| * | | | | | Remove user_color_scheme_classRobert Speicher2015-08-2511-41/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of rendering this value server-side, we use Javascript and Gon to apply the user's color scheme (or the default) to any syntax highlighted code blocks. This will make it easier to cache these blocks in the future because they're no longer state-dependent.
| * | | | | | Add highlight_word style definition to each color schemeRobert Speicher2015-08-256-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we don't need to override the user color scheme on search results. They'll look good with any of them.
| * | | | | | Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-255-30/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-2750-282/+335
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-08-2733-259/+235
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI improvements * use shared partials for repeating rendering of projects, groups, snippets etc * more consistency in way how projects, snippets and groups lists are rendered * fix 500 error when submit project snippet without body * remove some old and unused css * more compact search page See merge request !1214
| | * | | | | | Add changelog itemsDmitriy Zaporozhets2015-08-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Make search bar on search page more noticeableDmitriy Zaporozhets2015-08-275-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | More compact search pageDmitriy Zaporozhets2015-08-273-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Use same snippets icon everywhere. Fix list style for bordered-listDmitriy Zaporozhets2015-08-272-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Restyle snippets renderingDmitriy Zaporozhets2015-08-275-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>