- 25 3月, 2015 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Fix nested task lists When nesting task list items, the parent item is wrapped in a `<p>` tag. Update the task list parser to handle these paragraph wrappers. cc @sytse See merge request !413
-
- 24 3月, 2015 20 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
Don't mark merge request as updated when merge status relative to target branch changes. Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1254 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2165. See merge request !431
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
Don't include system notes in issue/MR comment count. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163. See merge request !430
-
由 Dmitriy Zaporozhets 提交于
Fix file mode going to next line in diff header See merge request !432
-
由 Douwe Maan 提交于
Don't use required keyword arguments to maintain support for Ruby 2.0. See merge request !433
-
由 Douwe Maan 提交于
This reverts commit af522ede.
-
由 Douwe Maan 提交于
-
由 Robert Schilling 提交于
Change comment in blue ui to match other scss
-
由 hebbet 提交于
Change comment in blue ui to match other scss files
-
由 Dmitriy Zaporozhets 提交于
Send EmailsOnPush email when branch or tag is created or deleted. Addresses #1951, #1957 and #1925. ![Screen_Shot_2015-03-17_at_13.58.15](https://dev.gitlab.org/gitlab/gitlabhq/uploads/16ff25adb4b4a7e1923612e0652442b4/Screen_Shot_2015-03-17_at_13.58.15.png) ![Screen_Shot_2015-03-17_at_13.58.22](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e346c1d84aba3a093b722d0a4167e289/Screen_Shot_2015-03-17_at_13.58.22.png) ![Screen_Shot_2015-03-17_at_13.58.28](https://dev.gitlab.org/gitlab/gitlabhq/uploads/720437ecc13f317c6d20eff82ac60bd7/Screen_Shot_2015-03-17_at_13.58.28.png) ![Screen_Shot_2015-03-17_at_13.58.34](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2b302bb6cdbe27c96a8dff1375236602/Screen_Shot_2015-03-17_at_13.58.34.png) See merge request !1709
-
由 Dmitriy Zaporozhets 提交于
Don't show commit comment button when user is not signed in. Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167. See merge request !429
-
由 Dmitriy Zaporozhets 提交于
Conflicts: app/controllers/users_controller.rb
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420
-
由 Dmitriy Zaporozhets 提交于
-
由 Douwe Maan 提交于
Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
-
由 Douwe Maan 提交于
-
由 Dmitriy Zaporozhets 提交于
Update views to single form of address. Change "my" to "your" Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password". cc @sytse @job See merge request !1736
-
- 23 3月, 2015 19 次提交
-
-
由 vichak 提交于
-
由 Douwe Maan 提交于
-
由 Douwe Maan 提交于
-
由 Douwe Maan 提交于
Include missing events and fix save functionality in admin service template settings form ### What does this MR do? This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings. ### Are there points in the code the reviewer needs to double check? No. ### Why was this MR needed? Because the service template form was broken and untested. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1275 Before: ![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png) After: ![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png) See merge request !427
-
由 Douwe Maan 提交于
-
由 Stan Hu 提交于
Closes #1275
-
由 Robert Schilling 提交于
Bump Docker build to GitLab v7.9.0 See merge request !426
-
由 Stan Hu 提交于
-
由 vichak 提交于
-
由 Douwe Maan 提交于
Faulty LDAP DN name escaping removed
-
由 Vinnie Okada 提交于
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
Fix OAuth2 issue importing a new project from GitHub and GitLab It appears that the GitLab OAuth2 client options were converted to strings instead of symbols when merged with the default options (i.e. `{}.merge(github_options)`). As a result, the OAuth2 defaults were being used. For example, the OAuth2 client options would have a key with `authorize_url` and `:authorize_url`, but the former was never used. As a result, the OAuth2 client would always use the wrong URL to talk to GitHub. Note that this bug should also have affected GitLab, but not Bitbucket: The OAuth client is careful to convert all keys to symbols. Closes #1268 See merge request !425
-
由 Stan Hu 提交于
Closes #1268
-
由 Dmitriy Zaporozhets 提交于
Disable reference generation in preformatted/code blocks ### Summary If a user adds text in code or preformatted text via Markdown or HTML that contains `#XXX`, the system adds a note that issue `XXX` was mentioned. This is particularly annoying because we often list gdb backtrace dumps into our issues, and many issues get mentioned as a result. For example: ``` (gdb) bt #0 0x00000000004004c4 in second () at main.cc:6 #1 0x00000000004004d2 in first () at main.cc:11 #2 0x00000000004004dd in main () at main.cc:17 (gdb) ``` ### Steps to reproduce 1. In an issue, write the above text using Markdown or HTML tags (e.g. `<code>`, `<pre>`). 2. Observe that [issue 1](https://gitlab.com/gitlab-org/gitlab-ce/issues/1) and [issue 2](https://gitlab.com/gitlab-org/gitlab-ce/issues/2) have a note that says they were mentioned. ### Expected behavior Everything enclosed in the code blocks should be ignored as references. ### Observed behavior Issues get referenced unnecessarily. ### Fix I've made `reference_extractor.rb` strip out HTML and Markdown blocks before processing. I considered running the raw text through the entire Markdown processor, but this seems overkill and perhaps could lead to some unintended side effects. See merge request !365
-