Commit Graph

528 Commits

Author SHA1 Message Date
Anže Jenšterle
a321bc846a Merge pull request #370 from hsluoyz/patch-1
Update CONTRIBUTING.md with a note for Windows.
2017-06-14 15:35:30 +02:00
Matej Kramny
66ea9edf58 Merge pull request #374 from strangeman/372-wrong-dates
fix wrong data format in Project activity log
2017-06-08 10:32:07 +01:00
Anton Markelov
6f2a71bbc9 fix wrong data format in Project activity log 2017-06-08 11:28:00 +10:00
Tom Paine
1c233e3c0d Update main.go
errors here are often to do with a misconfigured semaphore
2017-06-02 12:57:23 +01:00
Yang Luo
367a2b0218 Update CONTRIBUTING.md with a note for Windows. 2017-06-02 00:52:06 +08:00
Viktor Anderling
8bc1b7f2d2 Allow concurrency for tasks that does not collide
Two different concurrency modes are implemented, and is enabled by
setting "concurrency_mode" in the config file to either "project" or "node".

When "project" concurrency is enabled, tasks will run in parallel if and
only if they do not share the same project id, with no regard to the
nodes/hosts that are affected.

When "node" concurrency is enabled, a task will run in parallel if and
only if the hosts affected by tasks already running does not intersect
with the hosts that would be affected by the task in question.

If "concurrency_mode" is not specified, no task will start before the
previous one has finished.

The collision check is based on the output from the "--list-hosts"
argument to ansible, which uses the hosts specified in the inventory.
Thus, if two different hostnames are used that points to the same node,
such as "127.0.0.1" and "localhost", there will be no collision and two
tasks may connect to the same node concurrently. If this behaviour is
not desired, one should make sure to not include aliases for their hosts
in their inventories when enabling concurrency mode.

To restrict the amount of parallel tasks that runs at the same time, one
can add the "max_parallel_tasks" to the config file. This defaults to a
humble 10 if not specified.
2017-05-29 17:27:56 +02:00
Matej Kramny
f4425b7813 Merge pull request #364 from KBraham/develop
Typo fix main.go
2017-05-28 23:06:24 +02:00
KBraham
ce6c9929f4 Typo fix main.go
Fix typo in semaphore
2017-05-28 15:11:41 +02:00
Matej Kramny
a221d7f32d Merge pull request #359 from ansible-semaphore/feature/fix-login
Rewrite login functions
2017-05-23 21:22:34 +02:00
Matej Kramny
ca66c6d6f8 rewrite login functions 2017-05-20 18:46:36 +02:00
Matej Kramny
e6ae46141c update contributing.md 2017-05-20 16:32:03 +02:00
Matej Kramny
624f2c3527 fix for base paths 2017-05-20 16:25:41 +02:00
Matej Kramny
68c5c49fdc base path resources
fixes #350
2017-05-20 16:14:36 +02:00
Matej Kramny
a23ed8bfae run migrations on startup
fixes #332
2017-05-20 15:21:13 +02:00
Matej Kramny
0c6bf78a5f Merge pull request #355 from TeliaSweden/master
Fix nil pointer dereference when updating Template. Solves #337
2017-05-20 15:07:58 +02:00
Matej Kramny
37d8c71bba Merge pull request #345 from strangeman/alert-setting-343
Add option for per-project telegram alert to different chats
2017-05-20 15:07:42 +02:00
Matej Kramny
27f51db09c Merge pull request #357 from ecornely/master
Get tasks details
2017-05-20 15:03:47 +02:00
Matej Kramny
2cda261ad3 Merge pull request #342 from morph027/324-docker-zombies
fixes #324
2017-05-20 15:01:05 +02:00
Eric Cornely
26fa3267a0 Get tasks details
Reference issue #356

Get a single task
2017-05-18 14:29:57 +02:00
Viktor Anderling
bb064198dd Fix nil pointer dereference when updating Template
When updating a template with empty "Extra CLI Arguments" field, the
template.Arguments pointer becomes nil. The previous check whether this
variable is the empty string fails if it is already nil.
The fix introduces a lazy nil check before the empty string-check.
2017-05-16 16:49:56 +02:00
Anton Markelov
bff8297145 add option for per-project telegram alert to different chats 2017-05-03 14:27:58 +10:00
morph027
e74973589f fixes #324 2017-05-01 21:12:30 +02:00
Alan Campbell
39298cb0d2 Merge pull request #336 from strangeman/fix-auth-335
Fix login logic when ldap is enabled
2017-04-26 15:40:10 -04:00
Anton Markelov
6a8bebe32b fix login logic when ldap is enabled 2017-04-24 20:05:41 +10:00
Alan Campbell
387f655b4e Merge pull request #330 from strangeman/fix-alerts-329
fix alert templates after 5bcb34e
2017-04-22 00:05:10 -04:00
Anton Markelov
336773698c fix alert templates after 5bcb34e 2017-04-22 13:22:16 +10:00
Matej Kramny
0b276d137c set hostnaem 2017-04-19 21:25:03 +01:00
Matej Kramny
e22e3c167d fix docker answer file 2017-04-19 20:53:59 +01:00
Matej Kramny
6bf40d5631 Update Dockerfile
- fix make.sh
2017-04-19 20:38:05 +01:00
Matej Kramny
4cc04ac088 update changelog, bump version to 2.3.0 2017-04-19 20:10:42 +01:00
Matej Kramny
6b60329fe1 fix #323 2017-04-19 18:16:04 +01:00
Matej Kramny
6a3aeff44f add roadmap to readme 2017-04-18 17:55:12 +01:00
Matej Kramny
51daf7c708 fix placeholder 2017-04-18 17:34:04 +01:00
Matej Kramny
02afd2dd54 fix #303 2017-04-18 17:25:59 +01:00
Matej Kramny
9de02d0b17 fix #312 2017-04-18 17:21:10 +01:00
Matej Kramny
4858aad205 fix tests 2017-04-18 17:06:58 +01:00
Matej Kramny
e14da14b3b add octocat body
pug bug not there anymore
2017-04-18 16:51:02 +01:00
Matej Kramny
7c04a926d5 fix 2.2.1 migration #299 2017-04-18 16:42:00 +01:00
Matej Kramny
544b363f4b add default values for 2.3.0.sql 2017-04-18 16:37:55 +01:00
Matej Kramny
fe8851bcfe fixes for #310 2017-04-18 16:37:44 +01:00
Matej Kramny
68abf976be fixes for #297 2017-04-18 16:16:33 +01:00
Matej Kramny
9fd49333de Merge branch 'develop' of github.com:ansible-semaphore/semaphore into develop 2017-04-18 15:54:51 +01:00
Matej Kramny
60a6570bdc Merge pull request #299 from galexrt/improve-sql-error
Fix the primary key creation queries in v2.2.1 migration
2017-04-18 15:54:40 +01:00
Matej Kramny
5bcb34ef62 improvements for #287 2017-04-18 15:36:09 +01:00
Matej Kramny
96140045ae improve codebase after #275 2017-04-18 15:21:20 +01:00
Matej Kramny
4b6a518b73 fixes resulting from master merge 2017-04-18 14:58:48 +01:00
Matej Kramny
db4948cb89 Merge branch 'master' into develop
# Conflicts:
#	Dockerfile
#	api/login.go
#	api/projects/environment.go
#	api/projects/project.go
#	api/projects/templates.go
#	api/tasks/runner.go
#	api/users.go
#	db/versionHistory.go
#	util/bindata.go
2017-04-18 14:48:31 +01:00
Matej Kramny
9810051224 Merge pull request #321 from serkin/master
Fixes #320
2017-04-18 14:36:37 +01:00
Matej Kramny
9d65c7e81a Merge pull request #304 from z010107/master
Add JSON validation in environment model
2017-04-18 14:36:21 +01:00
Alan Campbell
7ea40d780a Merge pull request #310 from strangeman/ldap-auth
Simple authorization via LDAP
2017-04-17 01:51:13 -04:00